Merge "Camera: Avoid stream re-configuration when format gets overridden" into oc-mr1-dev