always set useDefaultState in UpdateDisplayState (fixes issue 2620)