Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev