Merge "Catch exceptions from setLockCredential()" into main