Video fixup

There have been some commits made outside of gerrit.  I may have missed these changes in those or they may have been made before the 4.3 release.

Either way this is a set of commits that we are missing when comparing our code with the M7 and the msm8960 kernels.