Merge "Update BufferQueue owners"