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