Merge "Cleanup pending Handler messages after test finished"