Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev