Merge "Put a black View in front of SurfaceView." into jb-dev