Merge "Don't crop top-most windows at rest." into klp-dev