Backport r1004451: Ensure there is another repaint when wobbly windows ends. CCBUG: 201244
Changed paths: