Merge "Generalize window bounds for layout" into sc-v2-dev