Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev