Merge "msm: Remove VFE global variable" into msm-3.4