Merge branch '1121-remove-overlay-twice' into 'devel_14.0.x'

don't allow to remove data overlay twice

See merge request !1065
32 jobs for devel_14.0.x in 15 minutes and 27 seconds (queued for 2 seconds)