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

Change-Id: I948c52052139980a29f0f32c89a5016e56be97a5