Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907 am: 5482790a Change-Id: If186deb432621b5ce819ab9789b9dd57e324b440