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