Merge "MediaRouter: Adjust icon size properly for orientation change" into mnc-ub-dev