Fix merge conflicts (import changes from dev-vis-mask)

4 jobs for dev-vis-mask-2
in 19 minutes and 33 seconds, using 0 compute credits, and was queued for 3 seconds
latest