Merge "Fix flaky TaskStackChangedListenerTest"