It turned out that my backport fix had an off-by-one error and caused another regression. Meanwhile the stable branch was already moved to 5.5 kernel base, and the upstream fix is included there. So this will be fixed in anyway in the next release with 5.5 kernel.