Secondary Roles with positive safety margin does not finish resolution until timeout is reached or resolution key is released

The resolution is correct, it is just not reached until timeout is reached or some other key action triggers resolution after safety margin has passed.  A wakeup for the resolution is simply never set.
I will fix this myself, just putting it here to not forget.