Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev am: 99d4417d am: 8201bb3a Change-Id: I64ed10191fcf3e119e67727a426c99e02123da80