Merge "Add config flag for useDeclaredMethodsForCallbacks" into main