Merge "Fix surface deletion order issue" into devel/master