Fix issue that popover doesn't be removed when layer cleared