move DisplayState into AppPrefs2.h