* add overriding to state machine test * overriding should consider soft disable too
* Handle NO_ENTRY in PRE_ENABLED * add test * add preEnabled NO_ENTRY test * stash * test soft disable * tuples * remove overriding until it's merged in * use Events class * fix tests and split out * don't rely on controlsd's counter