Merge "Enable SETTINGS_DO_NOT_RESTORE_PRESERVED by default" into rvc-dev