Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev