Merge "Wire up SurfaceView stretch effect" into sc-dev