Merge "MediaRouter: Use fill_parent for consistency" into mnc-ub-dev