This should help the flicker, thanks to KiritoDev
current patch fails when applied with `git apply` instead `apply_patch.sh`