Merge "Fix wifi direct issues" into jb-dev