Merge "Fix window properties to be per window zone"