Merge "Cleaning up deprecate_flags_and_settings_resets" into main