Merge "[settings] Add a knob to turn off incremental default" into rvc-dev am: 95955373 am: eb8307f2 am: 30e159d9 Change-Id: I62abf6233d36cee60ae1b2e3fd3495feb3ba4e6e