Added metrics service holder, improved channel killed notification callback process