Merge "Remove duplicate icon from TwoTargetSwitchPreference" into main