Merge "Fix bug with translation in ExpandableNotificationRow."