Merge "Update RestrictedSwitchPreference to have an additional summary." into nyc-dev