Merge "Fix device list update" into jb-mr1-dev