Merge "Add task focus change support to FocusTransitionListener" into main