Merge "MediaRouter: Loosen up the condition to show the play control layout" into mnc-ub-dev