Merge "Move SF trace logging into a separate thread"