Merge "Remove unused code from ExpandableNotificationRow" into tm-qpr-dev