Merge "Add null check before updating NotificationItemView" into ub-launcher3-master