Merge "MediaRouter: Select/unselect route controllers for the updated route group" into nyc-dev