Merge branch 'feature/JAL-3515-slivka-preferences' into alpha/JAL-3066_Jalview_212_sl...