Merge "No-op refactoring for suspending callbacks" into main