Merge "Fix window cropping issue."