Merge "Queue events if enrollment sidecar listener is null" into oc-dev