Merge "Add logging code for Context Hub restart"