diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ef3871cbb174f23f2db21fdff80b7274b2970e22..9aa9a796cc6ab16df4e708b2a803bf7d1846b232 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -58,7 +58,7 @@
 
         <!--  Preserve original launcher activity from Nougat. -->
         <activity-alias
-            android:name=".Launcher"
+            android:name=".LauncherActivity"
             android:targetActivity=".files.LauncherActivity"
             android:label="@string/launcher_label"
             android:icon="@drawable/launcher_icon" >
diff --git a/src/com/android/documentsui/services/FileOperationService.java b/src/com/android/documentsui/services/FileOperationService.java
index 005ed1d12d9b058c932f871ae810e9c79db2c4d9..68fb1008c84db37036df8f3fffbc4b66cd46c372 100644
--- a/src/com/android/documentsui/services/FileOperationService.java
+++ b/src/com/android/documentsui/services/FileOperationService.java
@@ -180,8 +180,6 @@ public class FileOperationService extends Service implements Job.Listener {
             Log.w(TAG, "Shutting down, but executor reports running jobs: " + unfinished);
         }
 
-        tearDownNotificationChannel();
-
         executor = null;
         deletionExecutor = null;
         handler = null;
@@ -189,12 +187,6 @@ public class FileOperationService extends Service implements Job.Listener {
         if (DEBUG) Log.d(TAG, "Destroyed.");
     }
 
-    private void tearDownNotificationChannel() {
-        if (features.isNotificationChannelEnabled()) {
-            notificationManager.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
-        }
-    }
-
     @Override
     public int onStartCommand(Intent intent, int flags, int serviceId) {
         // TODO: Ensure we're not being called with retry or redeliver.