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

Change-Id: I8962bd54a3b24bc2d8b0aee45c8295eed03fc54a