Merge "Frameworks: In the kill handler, ensure the logging handler was run"