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

Change-Id: I64ed10191fcf3e119e67727a426c99e02123da80