Merge "Fix coverage problem for window manager flag in shell" into main