Merge "Ensure animation is not played when an actor is not on scene" into devel/master