Merge "Add wireless display selection support to MediaRouter." into jb-mr1-dev