Merge "ContextHub: Avoid reference leaks" into cw-f-dev