Merge "Account for windows on non-app display."