Merge "Revert "Introduce `mTaskViewCount` inside the RecentsView"" into main