Correcting it when it is subsequently hidden and re-mapped will cause the position to be double offset by the size of the borders. (cherry picked from commit a71b2f0a93)
a71b2f0a93