Merge "Fix back gesture not being handled by BackAnimationController" into main