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

Change-Id: I31718ae56e7ede79798567fc70783156179e6753