Merge "Correct cropping of windows above decor layer." into pi-dev