Merge "Expose underlying panel vsync to SurfaceControl's display mode" into main