Merge "Fix bad parcelable for deviceId" into main