Merge "WindowState: Avoid destroying surface during relayout" into sc-dev