Merge "Fix unrecoverable bad state in BackAnimationController" into main