Merge "Reset RunningState on user related changes"