Merge "Reset to default did not reset cached settings"