Merge "Check null for before using LockSettingsService"