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

Change-Id: I10b683e78ea75a1ca9cdd4e31317aa7f284ac046