It seems that the upstream didn't react to my submitted patch (somehow the input subsystem upstream handling is slower / less responsive in these days, unfortunately). Likely need to resubmit.