Merge "Fix SurfaceView in LayoutLib." into lmp-preview-dev