Merge "Call surfaceplacement if the window goes for relayout" into sc-dev