Merge "Adding option to skip animations for testing" into main