Merge "Add support for remembering Wifi display devices." into jb-mr1-dev