Merge "Finish whole installation on cancel dialog." into nyc-dev