Merge "[settings] Add a knob to turn off incremental default" into rvc-dev am: 95955373 am: 363a7266 am: d422c57f Change-Id: I5e374775ea7372d8f67c0ad1e1266635b85424eb