Merge "LockSettingsService: fix names of user lifecycle methods" into main