Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev