Merge "If the app is archived, do not remove in case of playstore install error" into main