Merge "Consume sync draw handlers if the surface is destroyed" into tm-dev