Merge "Camera: Handle onBuffersDiscarded callback" into qt-qpr1-dev am: 6a971a6aec am: 053fe0f226

Change-Id: I4e8808204579c8baf79438cc8c323b2c65b84257