Merge "Correct Launcher3 for new sizes in App Widgets." into sc-dev