Merge "Fix NullPointerException at RunningState" into jb-mr2-dev