Merge "snapuserd: Refactor how buffers are managed." into main