Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE" am: 4741faa258
am: 949ea9bb2a

Change-Id: I8bc04464519557a7af8e4792f30bad901d206052