Grid resize / allowed grid locations not updated properly when changing UI scale

After going 1x -> 2x -> 1x, xfdesktop doesn't allow you to place icons at the bottom of the screen.

The icon positions are also not restored, though this may be related to the long-standing bugs around icon positions and resolution changes.