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

Change-Id: Ia78fc702f53baf6b1e0157912f034465714e8e75