Fix window properties to be per window zone

Bug: 70931486
Test: Compiles
Change-Id: Idb6daf0444f5fe18f251d01a1581fbcdde37f83c
1 file changed