Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev