Merge "ScopedCallback: Fix a typo in a comment"