Merge "msm: wfd: Clean up code in mdp subdevice"