Merge "Fix bug managing wifi display routes." into jb-mr2-dev