Merge "Fix NoVote/NoPreference on LayerHistory" into main