Merge "Add default maxBufferCount in GraphicBufferProducer" into main