Merge "Lock in Surface#destroy" into tm-dev