Merge "Split BufferQueue into core + producer + consumer"