packages/apps/Settings: unified patch from Jellaxy original branch