Merge "Further work on MediaRouter" into jb-dev