Merge "Fix invisible SurfaceViews"