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

Change-Id: Ifda6ba98bc66e2fa8719f14cb69356c7eb374cfa