Merge "Add SurfaceListener::onBufferAttached" into main