Merge "ContextHubService: Don't change app handle on load" into nyc-mr1-dev