Merge "Correctly rollback failed system app installs." into lmp-dev