Merge "Preserve windows when resizing tasks" into rvc-dev am: 03fa01bfa0 am: 52a34d8463

Change-Id: I26ba750e1688181a0d89cc597e65f15d6102d8b4