Merge "Add MediaRouter2 method to show the SystemUI output switcher"