Merge "MediaRouter: Show full height of the artwork" into mnc-ub-dev