Merge "Fix CommandScheduler NPE."