Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev

* changes:
  Cure narcolepsy.
  Allow applications to connect to known wifi displays.