SurfaceObserver should observe the surface

The clue's in the name.

Change-Id: I1941b87cbc70e195382e754dba3e64a2aa06d695
Merge "SurfaceObserver should observe the surface"