Merge "Re-land: Make window stable while resizing" into sc-dev