Merge "Add media routing to output chooser"