Fix for 3785211. Make sure to do a layout with the old position before doing a layou...