Merge "Make window stable while resizing" into sc-dev