Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907 am: 5482790a" into oc-dr1-dev-plus-aosp