Merge "Add support for Wifi display." into jb-mr1-dev