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