Merge "Cleanup user-set NLS list on package removed" into main