Merge "Prevent NPE on ExpandableNotificationRow." into sc-dev