Merge "Put starting the animation back inside state changed check" into sc-dev