Merge "Fix deadlock in MediaRouterService" into sc-v2-dev