Merge "Support alpha for SurfaceView"