Merge "MediaRouter2: Refactor internal classes"