Merge "Extract Shade window Layout params to a common place" into main