Merge "Fixes crash in security settings." into pi-dev