CommonInstaller: improve GApps removal mechanism

CommonInstaller

@@ -258,7 +258,6 @@ detect_mode () {
 }
 
 backup_nlpconflicts () {
-	if [ "${nanodroid_microg}" -eq 1 -o "${MODID}" = "NanoDroid_microG" ]; then
 	for app in ${GOOGLE_APPS}; do
 		case ${MODE} in
 			SYSTEM )
@@ -296,7 +295,6 @@ backup_nlpconflicts () {
 			;;
 		esac
 	done
-	fi
 }
 
 unpack_zip () {
@@ -313,12 +311,6 @@ unpack_zip () {
 }
 
 nanodroid_finalize () {
-	case ${MODID} in
-		NanoDroid | NanoDroid_microG )
-			backup_nlpconflicts
-		;;
-	esac
-
 	[ "${MODE}" = "MAGISK" ] && magisk_install_finish
 	rm -rf ${INSTALLER}
 
@@ -579,6 +571,10 @@ install_microg () {
 	# install microG if requested
 	# respectively force if it's the microG package
 	if [ "${nanodroid_microg}" -eq 1 -o "${MODID}" = "NanoDroid_microG" ]; then
+
+		# first get rid of conflicting packages
+		backup_nlpconflicts
+
 		case ${nanodroid_nlpbackend} in
 			0 ) NLPBACKEND=""
 			    ui_print " << with microG [Nominatim]" ;;