Merge "Fix failing MediaRouter2ManagerTest" into sc-dev