Merge "Camera: fix unknown bufId issue" into qt-dev am: 981693f6ff
am: 80962f507e

Change-Id: I8891fa28e20553a5109176828d5399bb0554b093