Add animation persistence flag and move singleton flag.