Merge "Remove restricted_icon from MainSwitchPreference" into udc-dev