Merge "SF: Short-circuit scheduler content detection"