Merge 520c90cc from master. do not merge.

Don't crash because of hardware acceleration.

Change-Id: I70554d5c7637b768cf815bb9f57a5d3e2c49066d
1 file changed