Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev