Merge "Break strong ref to ExpandableNotificationRow"