Merge "Hide ScopedTrace."