Remove race condition when opening/closing substates in same update
Merge pull request #1219 from JoeCreates/dev

Remove race condition when opening/closing substates in same update