When tracking state, only track current command buffer. Closes #1123

* In particular, when tracking a secondary command buffer we don't want to
  accidentally track state changes to the primary command buffer that may have
  happened after the secondary was recorded and should not override its state.