Merge "Ensure that LockscreenCredential#close() gets called" into main