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

Change-Id: I04c80d3e4bc37e9e0f6f8658df48cb6b282d360a