Merge "Reduce flakiness of TaskStackChangedListenerTest"