am 1f365488: am eec6e8a1: am 603389c0: am 50952d75: am 76d0b79e: am bb6fda6a: Provide final callbacks before remove CustomContent (issue 11169651)

* commit '1f36548891c2865b4dd4362bbee131b9a8a0abcc':