Merge "SF: Move MessageQueue to Scheduler"