Merge "Set width & height of app icons in all widgets tray to 48dp" into sc-dev