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

* commit 'e891a7888141fcd3e7956bf80425c885992fa2bf':
  Various improvements to the wifi display implementation.