Merge "Cleanup USER_OWNER in SettingsProvider[Test]"