CC-6981: Resolve default value updating when migrating from existing user

(cherry picked from commit d1a2822)

Author: dg-mega

iMEGA/Camera uploads/UploadManagers/CameraUploadManager+Settings.m

@@ -34,14 +34,18 @@ + (BOOL)isCameraUploadEnabled {
 }
 
 + (void)setCameraUploadEnabled:(BOOL)cameraUploadEnabled {
-    [self setMigratedToCameraUploadsV2:YES];
     [NSUserDefaults.standardUserDefaults setBool:cameraUploadEnabled forKey:IsCameraUploadsEnabledKey];
     [self configDefaultSettingsIfNeededForCameraUpload];
     [self configDefaultSharedAlbumsAndSyncedAlbumsSettingsIfNeeded];
+    [self setMigratedToCameraUploadsV2:YES];
 }
 
 + (void)configDefaultSettingsIfNeededForCameraUpload {
     if (![self isCameraUploadEnabled]) {
+        // Reset default value for VideoUploadsEnabled to YES, so that next time user turns on it will be the default
+        if([NSUserDefaults.standardUserDefaults objectForKey:IsVideoUploadsEnabledKey] == nil) {
+            [self setVideoUploadEnabled:YES];
+        }
         return;
     }
 
@@ -56,10 +60,6 @@ + (void)configDefaultSettingsIfNeededForCameraUpload {
     if ([NSUserDefaults.standardUserDefaults objectForKey:UploadAllBurstAssetsKey] == nil) {
         [self setUploadAllBurstPhotos:YES];
     }
-    
-    if ([NSUserDefaults.standardUserDefaults objectForKey:IsVideoUploadsEnabledKey] == nil) {
-        [self setVideoUploadEnabled:YES];
-    }
 }
 
 + (void)configDefaultSharedAlbumsAndSyncedAlbumsSettingsIfNeeded {

iMEGA/My Account/Settings/Camera Uploads/CameraUploadsTableViewController.m

@@ -60,9 +60,10 @@ - (void)viewDidLoad {
 
     if (self.isPresentedModally) {
         self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(modalDialogDoneButtonTouched)];
-        if (!CameraUploadManager.hasMigratedToCameraUploadsV2) {
-            [CameraUploadManager configDefaultSettingsForCameraUploadV2];
-        }
+    }
+    
+    if (!CameraUploadManager.hasMigratedToCameraUploadsV2) {
+        [CameraUploadManager configDefaultSettingsForCameraUploadV2];
     }
 
     [self updateAppearance];