Track the committed state on tokens

As part of some broader work to have the machine view correctly show the state for the tokens this branch tracks and sets the committed state of the machine/container tokens.

QA: There are no visual/functionality changes in this branch.