Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev