Revert "[BHV-16348]Issue of co-existing Popup and contextual popup"

This reverts commit cf5d2ccce90ee304c18fb8b8c7effe2978222eb2.