Merge "ContextHubService: Pass nanoapp header data explicitly"