Merge "msm: wfd: Restart hrtimer after forwarding it"