Merge "Delete unused param in MagModeSwitch#getIconResId" into main