I don’t tweak core files too. I just apply theme update as per normal.
Can you please go ahead and apply the patch to resolve the issue please?