Merge "Handle different window sizes."