Merge "Make TaskStackTransitionObserver..." into main