Fixed "single-account import" for non-default intent/kind/OC shadows.