Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev