Merge "Fix blink when docking a window."