Merge changes I99404218,Ic07b3851

* changes:
  SF: Clean up DisplayDeviceState
  SF: Use std::string for display name