Merge "Add a couple of bufferqueue owners" into main