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