Merge "Fix flakiness of testTaskChangeCallBacks"