Merge "MediaRouter: Ensure volume group list item height per orientation" into mnc-ub-dev