Merge changes from topic "revert-26228978-device-state-callbacks-XJADFJXEAY" into main

* changes:
  Revert "Promote DeviceStateManager to System API and update Devi..."
  Revert "Creates DeviceState objects with display properties"