Merge "MediaRouter: Dismiss the controller dialog only when a pending intent is set" into mnc-ub-dev