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

Change-Id: I616b14d8a990f0b1157f9e86beb96a4c0a084f05