Merge "Hide SAW subwindows" into sc-v2-dev