Merge "Simplify staged install resume flow." into sc-dev