Merge "Delete multiple surfaces when the updated thread is destroyed" into devel...