Merge "Revert "msm: wfd: Set default rate control to VBR/VFR""