Merge "Add NPE check for prediction controller" into rvc-dev am: f8e12b78bf am: 53c7ddd7fd am: 39e1af9a27

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12001481

Change-Id: I7b12335bc3f9b1d85a1d3600e3232251593af8e5

quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java

@@ -101,7 +101,8 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<BaseQuickstepLaunc
             });
         }
 
-        if (!hasReachedMaxCount(HOTSEAT_DISCOVERY_TIP_COUNT)) {
+        if (FeatureFlags.ENABLE_HYBRID_HOTSEAT.get() && !hasReachedMaxCount(
+                HOTSEAT_DISCOVERY_TIP_COUNT)) {
             stateManager.addStateListener(new StateListener<LauncherState>() {
                 boolean mFromAllApps = false;