Merge "Account for animating children when updating task visibility" into tm-dev