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

Change-Id: I091aaecebec82f58e6d74749fbdbfaeb64d85382