Merge changes from topic "am-206fe930edab4541bbeddd5b673d9e6f" into main

* changes:
  [automerger skipped] Merge "Hide SAW subwindows" into sc-v2-dev am: e9e162b0b6 -s ours am: 84835cbdcf -s ours am: 7d35bb4c65 -s ours am: 9830284398 -s ours am: 5eee61af83 -s ours am: bd03f96c5d -s ours
  [automerger skipped] Hide SAW subwindows am: 5a2a9f4991 -s ours am: 5fc51c8e12 -s ours am: 1c4546beea -s ours am: 21eaabc7b8 -s ours am: d588b9b699 -s ours am: 6c5be9810c -s ours