Merge "preferences: Preserve Status from saveFormData() in submitForm()"