[v9_16] Add test for in-view zone edits
This is a backport of !5316 (merged) + !5341 (merged) in a single MR.
Closes #2845 (closed), #2870 (closed)
This is a backport of !5316 (merged) + !5341 (merged) in a single MR.
Closes #2845 (closed), #2870 (closed)