diff --git a/app/App.tsx b/app/App.tsx
index 995ce125e..d15adda94 100644
--- a/app/App.tsx
+++ b/app/App.tsx
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
-// CI/CD Pipeline Test - July 29, 2025 - With Permissions Fix
 import 'react-native-get-random-values';
 
 import { Buffer } from 'buffer';
diff --git a/app/Gemfile.lock b/app/Gemfile.lock
index a1cf6be81..23855f94d 100644
--- a/app/Gemfile.lock
+++ b/app/Gemfile.lock
@@ -25,7 +25,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1136.0)
+    aws-partitions (1.1137.0)
     aws-sdk-core (3.227.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
diff --git a/app/src/components/native/QrCodeScanner.web.tsx b/app/src/components/native/QRCodeScanner.web.tsx
similarity index 100%
rename from app/src/components/native/QrCodeScanner.web.tsx
rename to app/src/components/native/QRCodeScanner.web.tsx
diff --git a/app/src/navigation/aesop.ts b/app/src/navigation/aesop.ts
index 6c6ebd0c3..0695b99b1 100644
--- a/app/src/navigation/aesop.ts
+++ b/app/src/navigation/aesop.ts
@@ -1,14 +1,10 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { lazy } from 'react';
 
 import { ProgressNavBar } from '../components/NavBar';
 import { shouldShowAesopRedesign } from '../hooks/useAesopRedesign';
-
-const PassportOnboardingScreen = lazy(
-  () => import('../screens/aesop/PassportOnboardingScreen'),
-);
+import PassportOnboardingScreen from '../screens/aesop/PassportOnboardingScreen';
 import { white } from '../utils/colors';
 
 const aesopScreens = {
diff --git a/app/src/navigation/dev.ts b/app/src/navigation/dev.ts
index f9eb110fc..e07feea6d 100644
--- a/app/src/navigation/dev.ts
+++ b/app/src/navigation/dev.ts
@@ -1,21 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { lazy } from 'react';
 
-const DevFeatureFlagsScreen = lazy(
-  () => import('../screens/dev/DevFeatureFlagsScreen'),
-);
-const DevHapticFeedbackScreen = lazy(
-  () => import('../screens/dev/DevHapticFeedback'),
-);
-const DevSettingsScreen = lazy(
-  () => import('../screens/dev/DevSettingsScreen'),
-);
-const MockDataScreen = lazy(() => import('../screens/dev/MockDataScreen'));
-const MockDataScreenDeepLink = lazy(
-  () => import('../screens/dev/MockDataScreenDeepLink'),
-);
+import DevFeatureFlagsScreen from '../screens/dev/DevFeatureFlagsScreen';
+import DevHapticFeedbackScreen from '../screens/dev/DevHapticFeedback';
+import DevSettingsScreen from '../screens/dev/DevSettingsScreen';
+import MockDataScreen from '../screens/dev/MockDataScreen';
+import MockDataScreenDeepLink from '../screens/dev/MockDataScreenDeepLink';
 import { white } from '../utils/colors';
 
 const devScreens = {
diff --git a/app/src/navigation/passport.ts b/app/src/navigation/passport.ts
index 1cec5acc2..bdbf5f48e 100644
--- a/app/src/navigation/passport.ts
+++ b/app/src/navigation/passport.ts
@@ -1,29 +1,14 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { lazy } from 'react';
 
-const PassportCameraScreen = lazy(
-  () => import('../screens/passport/PassportCameraScreen'),
-);
-const PassportCameraTrouble = lazy(
-  () => import('../screens/passport/PassportCameraTroubleScreen'),
-);
-const PassportNFCScanScreen = lazy(
-  () => import('../screens/passport/PassportNFCScanScreen'),
-);
-const PassportNFCTrouble = lazy(
-  () => import('../screens/passport/PassportNFCTroubleScreen'),
-);
-const PassportOnboardingScreen = lazy(
-  () => import('../screens/passport/PassportOnboardingScreen'),
-);
-const UnsupportedPassportScreen = lazy(
-  () => import('../screens/passport/UnsupportedPassportScreen'),
-);
-const NFCMethodSelectionScreen = lazy(
-  () => import('../screens/passport/NFCMethodSelectionScreen'),
-);
+import NFCMethodSelectionScreen from '../screens/passport/NFCMethodSelectionScreen';
+import PassportCameraScreen from '../screens/passport/PassportCameraScreen';
+import PassportCameraTrouble from '../screens/passport/PassportCameraTroubleScreen';
+import PassportNFCScanScreen from '../screens/passport/PassportNFCScanScreen';
+import PassportNFCTrouble from '../screens/passport/PassportNFCTroubleScreen';
+import PassportOnboardingScreen from '../screens/passport/PassportOnboardingScreen';
+import UnsupportedPassportScreen from '../screens/passport/UnsupportedPassportScreen';
 
 const passportScreens = {
   PassportCamera: {
diff --git a/app/src/navigation/prove.ts b/app/src/navigation/prove.ts
index 5d9008b16..a78a641f8 100644
--- a/app/src/navigation/prove.ts
+++ b/app/src/navigation/prove.ts
@@ -1,21 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { lazy } from 'react';
 
-const ConfirmBelongingScreen = lazy(
-  () => import('../screens/prove/ConfirmBelongingScreen'),
-);
-const ProofRequestStatusScreen = lazy(
-  () => import('../screens/prove/ProofRequestStatusScreen'),
-);
-const ProveScreen = lazy(() => import('../screens/prove/ProveScreen'));
-const QRCodeTroubleScreen = lazy(
-  () => import('../screens/prove/QRCodeTroubleScreen'),
-);
-const QRCodeViewFinderScreen = lazy(
-  () => import('../screens/prove/ViewFinderScreen'),
-);
+import ConfirmBelongingScreen from '../screens/prove/ConfirmBelongingScreen';
+import ProofRequestStatusScreen from '../screens/prove/ProofRequestStatusScreen';
+import ProveScreen from '../screens/prove/ProveScreen';
+import QRCodeTroubleScreen from '../screens/prove/QRCodeTroubleScreen';
+import QRCodeViewFinderScreen from '../screens/prove/ViewFinderScreen';
 import { black, white } from '../utils/colors';
 
 const proveScreens = {
diff --git a/app/src/navigation/recovery.ts b/app/src/navigation/recovery.ts
index d1aeb05e6..f82d3ecd4 100644
--- a/app/src/navigation/recovery.ts
+++ b/app/src/navigation/recovery.ts
@@ -1,26 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { lazy } from 'react';
 
-const AccountRecoveryChoiceScreen = lazy(
-  () => import('../screens/recovery/AccountRecoveryChoiceScreen'),
-);
-const AccountRecoveryScreen = lazy(
-  () => import('../screens/recovery/AccountRecoveryScreen'),
-);
-const AccountVerifiedSuccessScreen = lazy(
-  () => import('../screens/recovery/AccountVerifiedSuccessScreen'),
-);
-const PassportDataNotFound = lazy(
-  () => import('../screens/recovery/PassportDataNotFoundScreen'),
-);
-const RecoverWithPhraseScreen = lazy(
-  () => import('../screens/recovery/RecoverWithPhraseScreen'),
-);
-const SaveRecoveryPhraseScreen = lazy(
-  () => import('../screens/recovery/SaveRecoveryPhraseScreen'),
-);
+import AccountRecoveryChoiceScreen from '../screens/recovery/AccountRecoveryChoiceScreen';
+import AccountRecoveryScreen from '../screens/recovery/AccountRecoveryScreen';
+import AccountVerifiedSuccessScreen from '../screens/recovery/AccountVerifiedSuccessScreen';
+import PassportDataNotFound from '../screens/recovery/PassportDataNotFoundScreen';
+import RecoverWithPhraseScreen from '../screens/recovery/RecoverWithPhraseScreen';
+import SaveRecoveryPhraseScreen from '../screens/recovery/SaveRecoveryPhraseScreen';
 import { black, slate300 } from '../utils/colors';
 
 const recoveryScreens = {
diff --git a/app/src/navigation/settings.ts b/app/src/navigation/settings.ts
index 3321389f9..09ae294d8 100644
--- a/app/src/navigation/settings.ts
+++ b/app/src/navigation/settings.ts
@@ -1,21 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
 
 import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
-import { lazy } from 'react';
 
-const CloudBackupScreen = lazy(
-  () => import('../screens/settings/CloudBackupScreen'),
-);
-const ManageDocumentsScreen = lazy(
-  () => import('../screens/settings/ManageDocumentsScreen'),
-);
-const PassportDataInfoScreen = lazy(
-  () => import('../screens/settings/PassportDataInfoScreen'),
-);
-const SettingsScreen = lazy(() => import('../screens/settings/SettingsScreen'));
-const ShowRecoveryPhraseScreen = lazy(
-  () => import('../screens/settings/ShowRecoveryPhraseScreen'),
-);
+import CloudBackupScreen from '../screens/settings/CloudBackupScreen';
+import ManageDocumentsScreen from '../screens/settings/ManageDocumentsScreen';
+import PassportDataInfoScreen from '../screens/settings/PassportDataInfoScreen';
+import SettingsScreen from '../screens/settings/SettingsScreen';
+import ShowRecoveryPhraseScreen from '../screens/settings/ShowRecoveryPhraseScreen';
 import { black, slate300, white } from '../utils/colors';
 
 const settingsScreens = {