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