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