Merge "Eradicate DisplayID." into jb-mr1-dev