Merge "ContextHubService: Keep handles across hub reboot" into nyc-mr1-dev