Merge "SF: Fix a scheduler related mock leak"