I've found that patch doesn't fix the issue on v4.7 and does fix on v4.8. I'll try to bisect further.