Merge "Fixes a bug in migration of lock settings to LockSettingsService."