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