Hi:
Yes. Run git apply <PATCH> will apply the patch.
You should be able to see the changes in the commit in Here
The step I shared is to re-build UEFI bin. However, it will not fix the issue, Ref:
So, you might still need to follow another steps to build the optee image and re-flash onto NX.