Revert "Don't emit Surface changes back to the Surface"

This reverts commit 1987d3aa2bd97a6ea9961f4909103165c03634b5.

Change-Id: I5aaa6b0c743fbf6292030f566b6f7d993de740a7
Merge "Revert "Don't emit Surface changes back to the Surface""