Tested for a few months by the original poster and continues to work, so assuming it is stable enough to push it to mainline. BUG: 417142 FIXED-IN: 5.0.9 (cherry picked from commit 1cff1f9e)