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

Change-Id: I63746d78ab99f8c627fd74fc26811f2e2534a302