Merge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc-mr1-dev