Merge "Ignore some ScopedCallback IDE warnings"