Merge "Fix ScopedSignalHandler"