Merge "BufferQueue: Allow detaching/reattaching buffers"