Merge "More fun with MediaRouter" into jb-dev