Merge "Rename deviceId to persistentDeviceId" into main