Merge "Don't call onNullBinding when the service host is dead" into sc-dev