Merge "SF: add trace points for dispatcher system"