Merge "Trace measurement and layout of ExpandableNotificationRow"