Merge "Only send HOST_STATE intents when host mode is used." into oc-dev