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

Change-Id: I58942870242bf36f8b3230356a9b62bb0ed43847