Merge "Group window relayout requests" into sc-v2-dev