Merge "RegisteredMediaRouteProvider: Reorder methods"