Merge "Moved ScopedCallback to /libs"