Merge "Fix WindowlessWm null check"