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

Change-Id: I734c68b8bb9334f5e02dd34c69ac4bf4da0058b6