Adjust after cherry-picks

Author: jnowakow

modules/background-task/android/src/main/java/com/expensify/reactnativebackgroundtask/ReactNativeBackgroundTaskModule.kt

@@ -14,7 +14,6 @@ import android.content.IntentFilter
 import android.os.Build
 import android.os.PersistableBundle
 import android.util.Log
-import androidx.core.content.ContextCompat
 
 class ReactNativeBackgroundTaskModule internal constructor(context: ReactApplicationContext) :
   ReactNativeBackgroundTaskSpec(context) {

src/pages/Search/EmptySearchView.tsx

@@ -239,11 +239,12 @@ function EmptySearchView({type, hasResults}: EmptySearchViewProps) {
         styles.textAlignLeft,
         styles.emptyStateFolderWebStyles,
         subtitleComponent,
-        hasResults,
+        hasSeenTour,
         setRootStatusBarEnabled,
         ctaErrorMessage,
-        hasSeenTour,
         navatticURL,
+        shouldRedirectToExpensifyClassic,
+        hasResults,
         viewTourTaskReport,
         canModifyTheTask,
         canActionTheTask,