Merge "contexthub: Handle service death" into oc-dev