Merge "Freeze apps during upgrade, check if uninstalled." into nyc-dev