Merge "Do not trim tasks when updating activity visibilities" into rvc-dev am: 9d0f11b38d

Change-Id: Ib5e30ab7a4bf5886e9ae039b0d033a6a7ed8584e