Merge "Fix NPE in MceStateMachine when getState() is called during shut down"