Merge "Resets system flags when updating PackageSettings" into pi-dev