OCE-424 Reverted changes to custom popup logic
OCE-424 Reverted changes to custom popup logic

devgateway/ocua,devgateway/oc-explorer,devgateway/oc-explorer,devgateway/ocua,devgateway/oc-explorer,devgateway/ocua