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