Merge "Fixes two bugs with findLastActiveTasksAndRunCallback()" into main