Merge "Updated RestrictedSwitchPreference" into nyc-dev