[Bug: 21.5-b12] Geometry not respected when switching escreens