Merge "Show dynamic subtext for RestrictedSwitchPreference." into pi-dev