Merge "Add new wifi display discovery API." into jb-mr1-dev