Merge "Holepunch layers for SurfaceView" into sc-dev