Merge "Retry wifi display connections." into jb-mr1-dev