Seems OK to me, though I would reference #2813 in the source code comment.
Good idea, done.
It probably won't really hurt even if a fix is made upstream right?
Probably, it depends on the potential upstream fix but I guess the risk the change here will make it worse is quite low.