Merge "Fixes two BackAnimationController crash from window focus change." into main