Merge "Corrects the icons of magnification switch" into sc-dev