Merge "Clean up device list - do not merge" into jb-dev