Does this commit alone suffice? Then I can easily backport it to 4.7.x kernel. (Though, the next TW kernel might be already 4.8. But it's still worth to put.)