Merge "Fix NPE in WindowState#needsRelativeLayeringToIme"