Merge "Move security settings to security package"