Merge "Fix continous crash in WindowManager in boot" into nyc-dev
am: 927b6be3d9

* commit '927b6be3d960a42bbc75aacc8dcde792a1d564b4':
  Fix continous crash in WindowManager in boot

Change-Id: I6207c320404ff1f0fed5284afe550a9163ea78a7