Merge changes from topic "am-12b0df7f1d464fa38b7cfbf69ba4167d" 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: afa48a9d -s ours am: 274641a4 -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: 338eacfd -s ours am: 68744b8d -s ours