Merge "SF: Fix stray pointers in Scheduler"