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

* commit '2f9a44101f4fd372834c67150aea76a07b94b5ec':
  Fix wifi display shutdown deadlock.