Merge changes Ic400e8d1,If108059c

* changes:
  SF: Add and use MockGraphicBufferProducer/Consumer
  SF: Abstract out buffer queue creation