Merge "Improve Wifi display discovery API." into jb-mr1-dev