Merge "Fix inaccurate ItemInfo.id from DatabaseHelper with AtomicInteger" into main