Merge "Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev am: 99d4417d am: 2ab46498" into qt-r1-dev-plus-aosp