Merge "[settings] Add a knob to turn off incremental default" into rvc-dev