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