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

* commit '603389c00ca065ddf055ad2652490a6d2e834f26':