Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev