Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev