Merge "Camera: Update stream consumer usage flag" into oc-mr1-dev