Merge "ContextHub: Fix map access" into pi-dev