Merge "Fix NullPointerException at RunningState"