Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev