Merge "fixup! Show event log when application data is deleted" into main