I pushed the fix to master/for-next branch now. I didn't push to packaging/for-next since it seems specific to 5.5 kernel, and older kernels work fine as is.