Merge "Preserve windows when resizing tasks" into rvc-dev am: 03fa01bfa0 am: 52a34d8463 am: 5b82895c94

Change-Id: I5fc9551b43552eb15f052ab0256b7aeab295dd48