Merge "Camera: Set buffer request stream id" into qt-dev am: 94dd578b02
am: 32ef6882e9

Change-Id: If5de3d283d25a7152e4f43b7ff67d763eec28d8e