Merge "MediaRouter dialog" into jb-dev