am 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev

* commit '6673c21275772af55c9ae72cd78cbbe710edc023':
  Put a black View in front of SurfaceView.