Merge "Fix for onTaskRemovalStarted callback being sent incorrectly"