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

* changes:
  [automerger skipped] Merge "Hide SAW subwindows" into sc-v2-dev am: e9e162b0 -s ours am: 84835cbd -s ours am: 7d35bb4c -s ours am: 98302843 -s ours am: 5eee61af -s ours am: bd03f96c -s ours
  [automerger skipped] Hide SAW subwindows am: 5a2a9f49 -s ours am: 5fc51c8e -s ours am: 1c4546be -s ours am: 21eaabc7 -s ours am: d588b9b6 -s ours am: 6c5be981 -s ours