Merge "Restrict MediaRouter selection" into jb-dev