Merge "UserCredentialsSettings: remove unneeded checks for locksettings keys"