Merge "MediaRouter: Address API review issues"