Merge "SF: Fix thread safety for scheduler callbacks"