Merge "WindowManagerService: add some defensive checks"