GitLab

- Partially reverts commit 789a0c82.
- Leaves the fix in Surface, but reverts all changes to the
  Producer/Consumer listeners.

Bug 27246023
Bug 27229287

Change-Id: I9283f9e59e666b5ae44c0db25f99a80d05eea3ee