Merge "Update wifi display device name when renamed." into jb-mr1-dev