Merge "setPackagesSuspended now overwrites all the state" into pi-dev