shell: Refactor pending surfaces for existing pending ones

No match.