Merge "WFD fixes" into jb-mr1-dev