Merge "Fix continous crash in WindowManager in boot" into nyc-dev