SurfaceView behind drawing view.
Can't test the surface view.
Merge remote-tracking branch 'origin/master'