Merge "Do not trim tasks when updating activity visibilities" into rvc-dev