Merge changes Ife42e95d,Ia9b621d3,I79c5c60c

* changes:
  SF: Replace MessageBase classes with LambdaMessage
  SF: Use consistent names for display IDs
  SF: Use std::map for DisplayDevice lookup