Merge "msm: wfd: Add timeouts to completions"