Merge "Fix visual artifacts in some multi-window scenarios"