Merge "Various improvements to the wifi display implementation." into jb-mr1-dev