Merge "Preemptively adjust task info visibility when evicting tasks" into main