chore($handler-cleanup): fix "Processing..." flicker #1157