Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev
am: 99d4417d4f

Change-Id: I99ad47e8e92f4831f6434e3952661849e55004c1