Merge "MediaRouter: make route controllers return route info"