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

Change-Id: If4be33e18a761a5ad2fb522fad046a2811818f90