Merge "Revert "msm: vidc: Fix camcorder stability issue""