Merge "Camera: fix NPE in buffer error callback" into qt-qpr1-dev am: d0a1ab93d4
am: e0630bca2d

Change-Id: Id0b3d0ba82579fe835b184561a8580d77fce94ba