Merge "Use FocusTransitionObserver in KeyguardTransitionHandler" into main