Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev