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