Merge "Reset isValuePreservedInRestore in Setting::reset()" into rvc-dev