Merge "Update DeviceStateController to use new DSM API's" into main