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