Merge "Make BackAnimationController dumpable" into main