Settings: Fix cherry pick conflict