[automerger skipped] Merge "Camera: Handle onBuffersDiscarded callback" into qt-qpr1-dev am: 6a971a6aec am: 053fe0f226 am: 1d8e707a3c -s ours
am skip reason: Change-Id Ifac5e852e2a1ac50f5c3f2e047966c59eeb5f1ba with SHA-1 0160ddd149 is in history

Change-Id: Id404ccd29455f34301f2acf8f952d9aad4acd0c7