Fixed bug where the marker/thumb enabled instance state was not saved/restored