am bb6fda6a: Provide final callbacks before remove CustomContent (issue 11169651)

* commit 'bb6fda6ac3c4246b91cf66b28cdbc89c3d8a3e52':
  Provide final callbacks before remove CustomContent (issue 11169651)