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

Change-Id: I49c6bf7b51f7d3a8c08d4c7a0371ae8e17bf3014