Merge "SurfaceControl: add a null check for present fence" into main