Merge "Pass additional flags to UninstallerActivity to handle archiving case when app's data should be saved." into main