Merge "Add SurfaceView callback event logs" into main