Merge "ApiOptions: fix resetting some preferences to default"