I submitted the patch to usptream. Let's see whether it's accepted. Then we can backport to TW kernel.