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

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