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