Merge "Hide SAW subwindows" into main