Merge \\"Make background black while playing video.\\" into nyc-mr1-dev am: 371d13e393
am: 22c249348a

Change-Id: I9253fa9e5b64dd5acdb71ffec983eb44c8af2914