Fix video playback / camcorder issues

Credit/Thanks to Roger Noriega

Change-Id: Idafddcf62106a89dac95f42cfcd2784153adbb58