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

Change-Id: I9febd46142b3519f12324237c6633c77060b558e