serrano: Use better workaround for video preview issue

Change-Id: Iadb46155ff00781516917e048c2dff6206d98cca
Merge branch 'cm-11.0' into martincz