Merge "Correct getViewTypeCount for Calendar AppWidget"