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

Change-Id: I6ea27f797214d12f16270bfea6d26350e1c28ce2