Merge "Fix crash when package list is updated"