Merge "Allow unsuspending critical packages" into pi-dev