Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev