Merge "Camera: fix unknown bufId issue" into qt-dev am: 981693f6ff am: 763972468f
am: b26c10d05f

Change-Id: Ie0b2496850330af14715155813cfa6223d1c3594