Merge "msm: wfd: Flush encoder after stopping VSG"