Merge "Don't do a wifi p2p scan in MediaRouter if we're already connected" into jb-mr1-dev