Merge "Fix NPE when changing server settings w/security dialog"