Merge "MediaRouter: Renames supportControlCategory as supportControlCategories"