Merge "[settings] Add a knob to turn off incremental default" into rvc-dev am: 95955373 am: eb8307f2 am: 85d86b3a Change-Id: I191dafbb81d65e37b0b430ae39e31ed013ad9cb7