Merge "Remove references to safe_mode INI setting"