am d58522bb: am 2f9a4410: Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev

* commit 'd58522bbd87cd09c8e7953a992a3b97f6ca7f30f':
  Fix wifi display shutdown deadlock.