Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev