Merge "Don't keep pregrants for non-system apps after partial uninstallation" into main