Merge "SF: don't latch unsignaled if there are multiple apply tokens" into tm-dev