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

Change-Id: I79c907454876bdd053bf5f252313468fe594eb2a