Merge "Add tests for profile keys in LockSettingsStorage" into nyc-dev