Merge "Added handling apps query response from context hub" into nyc-dev