Merge "Passes in more specific types to DeviceState and DeviceStateInfo" into main