Improve tracking of the driver state, fix a couple problems in showing images when they shouldn’t be