Merge "Refactor the SADeviceState to AdiDeviceState" into main