Merge "Fix null dereference in WMShell transition" into main