Merge "MediaRouter: make setControlCategories synchronous"