Add option for turning on/off splitting/merging marker animation

Better read this PR commit by commit
Reading the total diff is painful