Flatten the call stacks ActiveSupport::Callbacks produces, fix #18011.
Merge pull request #18219 from jaroslawr/master

Flatten the call stacks ActiveSupport::Callbacks produces, fix #18011.