We have the same issue and I just tried to merge the mentioned commit.
Apart from this changelist being for the internal perforce and not the public git, this change alone isn’t sufficient. It’s far to reliant on changes before, so I don’t think it’s easily possible to merge this fix into 4.11, unfortunately. It was worth a try though.