Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev