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

Change-Id: I63ba834ec55300d97ad1b2b8cde78c5ff8b5a092