Draft: [surface model] Fix overlap detection for scenes
This needs to be fixed after the latest scene fixes in !1114 (merged) !1112 (merged) !1109 (merged) !1108 (merged).
This needs to be fixed after the latest scene fixes in !1114 (merged) !1112 (merged) !1109 (merged) !1108 (merged).