Merge "Surface: Add a SurfaceQueueOutput struct for replaced buffers" into main