Backport pbi fixes to pc-updatemanager