Merge "Moved cutout info into WindowFrames"