Merge "Fix system settings not cleared when package data is cleared"