Merge "Camera: don't enable buffer manager for display/texture streams" into qt-dev am: 68b8684c8e
am: b6e483bbd2

Change-Id: Ief68b2adf5ded5b2936289527848e943423dc70c