Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
am: 401b8907d0

Change-Id: Ib7a916fb484fb3a7924315169d162f4fdddd8a06