Merge \\"Place a black layer behind SurfaceView.\\" into nyc-dev am: 0360a900f7
am: 118b3d23de

Change-Id: I812a4556ad9c9c9120914c6c101fbc697c677ad5