Merge "MediaRouter: Add setControlCategories to MediaRouter"