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

Change-Id: I7fe8ea1c8a9e0a533bd7e6abf452a2d0920da434