Merge "Update restricted icon position in RestrictedSwitchPreference." into nyc-dev