am e646b2d2: Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev

* commit 'e646b2d26459ca30667097e9600ee3f57ebfd228':
  Various improvements to a cleaner shutdown of the wifi display connection.