Merge "Resolve race condition in TaskStackChangedListenerTest"