Merge "Place a black layer behind SurfaceView." into nyc-dev