Merge "Fix Post Boot Regression after migrating stepping animation" into main