Merge "Revert "Break strong ref to ExpandableNotificationRow""