Merge "Preserve windows when resizing tasks" into rvc-dev am: 03fa01bfa0 am: 3e3bfca6d6

Change-Id: I07968e223ab864db41541a7837ba76981799b060