Merge "MediaRouter2: Clean up APIs"