NXP-14448: Fix settings launch - bad merging