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