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

Change-Id: Icd77a15f4debe870342976ebbf2edc5544039f38