It was applied upstream (thanks for that) but it did not make it into the release 2.0.17-3. Since I am in the lucky situation that it currently happens always on my laptop I could verify that the fix is working.