Merge "Media: Remove @MainThread from MediaRouter2"