am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev

* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
  Added unique id to display devices and their settings.