Merge "Null AppWindowThumbnail SurfaceControl after releasing it."