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

Change-Id: I9bdf0738c88dc18c258ee815a64d4ae0e4e40f2b