Merge "Updates DeviceState to use specific parcel methods" into main