Merge "Speed up StepIfSignalHandler path."