fix(frontend): only use arrangement backfill for non-singleton upstream

fix(frontend): only use arrangement backfill for non-singleton upstream #31072