[automerger skipped] Merge "libgui: Add discardFreeBuffers callback to producer" into qt-qpr1-dev am: 86ced3ef am: 36a08efe -s ours
am skip reason: Change-Id I7f46e977f3edc3b08177654531745d8ca0b86889 with SHA-1 067fcd36 is in history
Change-Id: Ibec037fd9d3c8ae918dfc63aa1672b3d95865a95