diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
index 2a1efcc2f49..4f6ecac1ecc 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
@@ -33,11 +33,6 @@ class ProfileEditActivity : InjectableAppCompatActivity() {
     profileEditActivityPresenter.handleOnCreate()
   }
 
-  override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
-    super.onRestoreInstanceState(savedInstanceState)
-    profileEditActivityPresenter.handleOnRestoreSavedInstanceState()
-  }
-
   override fun onSupportNavigateUp(): Boolean {
     val isMultipane = intent.extras!!.getBoolean(KEY_IS_MULTIPANE, false)
     if (isMultipane) {
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt
index 1a2ac8409a6..441efce3084 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt
@@ -1,7 +1,6 @@
 package org.oppia.android.app.settings.profile
 
 import android.content.Intent
-import android.widget.Switch
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
@@ -9,7 +8,6 @@ import androidx.lifecycle.Observer
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.model.ProfileId
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.ProfileEditActivityBinding
 import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
@@ -21,12 +19,11 @@ import javax.inject.Inject
 class ProfileEditActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val logger: ConsoleLogger,
-  private val profileManagementController: ProfileManagementController,
-  private val viewModelProvider: ViewModelProvider<ProfileEditViewModel>
+  private val profileManagementController: ProfileManagementController
 ) {
-  private val editViewModel: ProfileEditViewModel by lazy {
-    getProfileEditViewModel()
-  }
+
+  @Inject
+  lateinit var profileEditViewModel: ProfileEditViewModel
 
   fun handleOnCreate() {
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -37,12 +34,10 @@ class ProfileEditActivityPresenter @Inject constructor(
       R.layout.profile_edit_activity
     )
     val profileId = activity.intent.getIntExtra(KEY_PROFILE_EDIT_PROFILE_ID, 0)
-    editViewModel.setProfileId(
-      profileId,
-      activity.findViewById<Switch>(R.id.profile_edit_allow_download_switch)
-    )
+    profileEditViewModel.setProfileId(profileId)
+
     binding.apply {
-      viewModel = editViewModel
+      viewModel = profileEditViewModel
       lifecycleOwner = activity
     }
 
@@ -55,7 +50,7 @@ class ProfileEditActivityPresenter @Inject constructor(
         ProfileResetPinActivity.createProfileResetPinActivity(
           activity,
           profileId,
-          editViewModel.isAdmin
+          profileEditViewModel.isAdmin
         )
       )
     }
@@ -64,6 +59,20 @@ class ProfileEditActivityPresenter @Inject constructor(
       showDeletionDialog(profileId)
     }
 
+    profileEditViewModel.profile.observe(
+      activity,
+      Observer {
+        activity.title = it.name
+      }
+    )
+
+    profileEditViewModel.isAllowedDownloadAccess.observe(
+      activity,
+      Observer {
+        binding.profileEditAllowDownloadSwitch.isChecked = it
+      }
+    )
+
     binding.profileEditAllowDownloadSwitch.setOnCheckedChangeListener { compoundButton, checked ->
       if (compoundButton.isPressed) {
         profileManagementController.updateAllowDownloadAccess(
@@ -85,10 +94,6 @@ class ProfileEditActivityPresenter @Inject constructor(
     }
   }
 
-  fun handleOnRestoreSavedInstanceState() {
-    activity.title = editViewModel.profileName
-  }
-
   private fun showDeletionDialog(profileId: Int) {
     AlertDialog.Builder(activity, R.style.AlertDialogTheme)
       .setTitle(R.string.profile_edit_delete_dialog_title)
@@ -111,8 +116,4 @@ class ProfileEditActivityPresenter @Inject constructor(
           )
       }.create().show()
   }
-
-  private fun getProfileEditViewModel(): ProfileEditViewModel {
-    return viewModelProvider.getForActivity(activity, ProfileEditViewModel::class.java)
-  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
index c796add4cb0..afceab2b050 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
@@ -1,8 +1,7 @@
 package org.oppia.android.app.settings.profile
 
-import android.widget.Switch
-import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.model.Profile
@@ -14,18 +13,18 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.logging.ConsoleLogger
 import javax.inject.Inject
 
-// TODO(#1633): Fix ViewModel to not depend on View
 /** The ViewModel for [ProfileEditActivity]. */
 @ActivityScope
 class ProfileEditViewModel @Inject constructor(
-  private val activity: AppCompatActivity,
   private val logger: ConsoleLogger,
   private val profileManagementController: ProfileManagementController
 ) : ObservableViewModel() {
   private lateinit var profileId: ProfileId
-  private lateinit var switch: Switch
 
-  lateinit var profileName: String
+  private val isAllowedDownloadAccessMutableLiveData = MutableLiveData<Boolean>()
+
+  /** Specifies whether download access has been enabled by the user. */
+  val isAllowedDownloadAccess: LiveData<Boolean> = isAllowedDownloadAccessMutableLiveData
 
   val profile: LiveData<Profile> by lazy {
     Transformations.map(
@@ -36,9 +35,8 @@ class ProfileEditViewModel @Inject constructor(
 
   var isAdmin = false
 
-  fun setProfileId(id: Int, switch: Switch) {
+  fun setProfileId(id: Int) {
     profileId = ProfileId.newBuilder().setInternalId(id).build()
-    this.switch = switch
   }
 
   private fun processGetProfileResult(profileResult: AsyncResult<Profile>): Profile {
@@ -50,9 +48,7 @@ class ProfileEditViewModel @Inject constructor(
       )
     }
     val profile = profileResult.getOrDefault(Profile.getDefaultInstance())
-    switch.isChecked = profile.allowDownloadAccess
-    activity.title = profile.name
-    profileName = profile.name
+    isAllowedDownloadAccessMutableLiveData.value = profile.allowDownloadAccess
     isAdmin = profile.isAdmin
     return profile
   }
diff --git a/app/src/main/res/layout/profile_edit_activity.xml b/app/src/main/res/layout/profile_edit_activity.xml
index 432318c5dcd..c8503fb7981 100644
--- a/app/src/main/res/layout/profile_edit_activity.xml
+++ b/app/src/main/res/layout/profile_edit_activity.xml
@@ -12,228 +12,234 @@
       type="org.oppia.android.app.settings.profile.ProfileEditViewModel" />
   </data>
 
-  <androidx.constraintlayout.widget.ConstraintLayout
+  <ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/profileEditBackground"
-    android:clipToPadding="false">
+    android:fillViewport="true">
 
-    <LinearLayout
-      android:id="@+id/linearLayout"
+    <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:clipToPadding="false"
-      android:orientation="vertical"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/profile_edit_main">
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey" />
-
-      <Button
-        android:id="@+id/profile_rename_button"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:fontFamily="sans-serif"
-        android:gravity="start|center_vertical"
-        android:minHeight="48dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="@string/profile_edit_rename"
-        android:textAllCaps="false"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="16sp" />
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey" />
-
-      <Button
-        android:id="@+id/profile_reset_button"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:fontFamily="sans-serif"
-        android:gravity="start|center_vertical"
-        android:minHeight="48dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="@string/profile_edit_reset"
-        android:textAllCaps="false"
-        android:textColor="@color/oppiaPrimaryText"
-        android:textSize="16sp" />
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey" />
+      android:background="@color/profileEditBackground"
+      android:clipToPadding="false">
 
       <LinearLayout
+        android:id="@+id/profile_edit_actions_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clipToPadding="false"
         android:orientation="vertical"
-        android:visibility="@{viewModel.profile.isAdmin ? View.GONE : View.VISIBLE}">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/profile_edit_main">
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:background="@color/grey" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-          android:id="@+id/profile_edit_allow_download_container"
+        <Button
+          android:id="@+id/profile_rename_button"
+          style="?android:attr/borderlessButtonStyle"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:background="@color/white"
+          android:fontFamily="sans-serif"
+          android:gravity="start|center_vertical"
+          android:minHeight="48dp"
           android:paddingStart="16dp"
-          android:paddingTop="12dp"
           android:paddingEnd="16dp"
-          android:paddingBottom="12dp">
+          android:text="@string/profile_edit_rename"
+          android:textAllCaps="false"
+          android:textColor="@color/oppiaPrimaryText"
+          android:textSize="16sp" />
 
-          <LinearLayout
-            android:id="@+id/linearLayout2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="24dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/profile_edit_allow_download_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:background="@color/grey" />
 
-            <TextView
-              android:id="@+id/profile_edit_allow_download_heading"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:fontFamily="sans-serif"
-              android:text="@string/profile_edit_allow_download_heading"
-              android:textColor="@color/oppiaPrimaryText"
-              android:textSize="16sp" />
-
-            <TextView
-              android:id="@+id/profile_edit_allow_download_sub"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:fontFamily="sans-serif"
-              android:text="@string/profile_edit_allow_download_sub"
-              android:textColor="@color/light_grey"
-              android:textSize="14sp" />
-          </LinearLayout>
-
-          <Switch
-            android:id="@+id/profile_edit_allow_download_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <Button
+          android:id="@+id/profile_reset_button"
+          style="?android:attr/borderlessButtonStyle"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:background="@color/white"
+          android:fontFamily="sans-serif"
+          android:gravity="start|center_vertical"
+          android:minHeight="48dp"
+          android:paddingStart="16dp"
+          android:paddingEnd="16dp"
+          android:text="@string/profile_edit_reset"
+          android:textAllCaps="false"
+          android:textColor="@color/oppiaPrimaryText"
+          android:textSize="16sp" />
 
         <View
           android:layout_width="match_parent"
           android:layout_height="1dp"
           android:background="@color/grey" />
-      </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="12dp"
-      android:clipToPadding="false"
-      android:orientation="vertical"
-      android:visibility="@{viewModel.profile.isAdmin ? View.GONE : View.VISIBLE}"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/linearLayout"
-      app:layout_constraintVertical_bias="1.0">
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey" />
 
-      <Button
-        android:id="@+id/profile_delete_button"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:fontFamily="sans-serif"
-        android:gravity="start|center_vertical"
-        android:minHeight="48dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="@string/profile_edit_delete"
-        android:textAllCaps="false"
-        android:textColor="@color/red"
-        android:textSize="16sp" />
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey" />
-    </LinearLayout>
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:visibility="@{viewModel.profile.isAdmin ? View.GONE : View.VISIBLE}">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:id="@+id/profile_edit_main"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="@color/white"
-      android:clipToPadding="false"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
+          <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/profile_edit_allow_download_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:paddingStart="16dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="12dp">
+
+            <LinearLayout
+              android:id="@+id/linearLayout2"
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_marginEnd="24dp"
+              android:orientation="vertical"
+              app:layout_constraintBottom_toBottomOf="parent"
+              app:layout_constraintEnd_toStartOf="@id/profile_edit_allow_download_switch"
+              app:layout_constraintStart_toStartOf="parent"
+              app:layout_constraintTop_toTopOf="parent">
+
+              <TextView
+                android:id="@+id/profile_edit_allow_download_heading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:text="@string/profile_edit_allow_download_heading"
+                android:textColor="@color/oppiaPrimaryText"
+                android:textSize="16sp" />
+
+              <TextView
+                android:id="@+id/profile_edit_allow_download_sub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:text="@string/profile_edit_allow_download_sub"
+                android:textColor="@color/light_grey"
+                android:textSize="14sp" />
+            </LinearLayout>
+
+            <Switch
+              android:id="@+id/profile_edit_allow_download_switch"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginTop="4dp"
+              android:layout_marginEnd="12dp"
+              app:layout_constraintEnd_toEndOf="parent"
+              app:layout_constraintTop_toTopOf="parent" />
+          </androidx.constraintlayout.widget.ConstraintLayout>
+
+          <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/grey" />
+        </LinearLayout>
+      </LinearLayout>
 
       <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="12dp"
+        android:clipToPadding="false"
         android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="@id/profile_edit_image"
+        android:visibility="@{viewModel.profile.isAdmin ? View.GONE : View.VISIBLE}"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@id/profile_edit_image"
-        app:layout_constraintTop_toTopOf="@id/profile_edit_image">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/profile_edit_actions_container"
+        app:layout_constraintVertical_bias="1.0">
 
-        <TextView
-          android:id="@+id/profile_edit_name"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:fontFamily="sans-serif-medium"
-          android:text="@{viewModel.profile.name}"
-          android:textColor="@color/oppiaPrimaryText"
-          android:textSize="20sp"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:background="@color/grey" />
 
-        <TextView
-          android:id="@+id/profile_edit_created"
-          android:layout_width="wrap_content"
+        <Button
+          android:id="@+id/profile_delete_button"
+          style="?android:attr/borderlessButtonStyle"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
+          android:background="@color/white"
           android:fontFamily="sans-serif"
-          android:textColor="@color/oppiaPrimaryText"
-          android:textSize="16sp"
-          profile:created="@{viewModel.profile.dateCreatedTimestampMs}" />
+          android:gravity="start|center_vertical"
+          android:minHeight="48dp"
+          android:paddingStart="16dp"
+          android:paddingEnd="16dp"
+          android:text="@string/profile_edit_delete"
+          android:textAllCaps="false"
+          android:textColor="@color/red"
+          android:textSize="16sp" />
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:background="@color/grey" />
       </LinearLayout>
 
-      <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/profile_edit_image"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="28dp"
-        android:layout_marginBottom="36dp"
-        android:elevation="2dp"
-        android:translationZ="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/profile_edit_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:clipToPadding="false"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        profile:src="@{viewModel.profile.avatar}" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="24dp"
+          android:layout_marginEnd="8dp"
+          android:orientation="vertical"
+          app:layout_constraintBottom_toBottomOf="@id/profile_edit_image"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintHorizontal_bias="0.0"
+          app:layout_constraintStart_toEndOf="@id/profile_edit_image"
+          app:layout_constraintTop_toTopOf="@id/profile_edit_image">
+
+          <TextView
+            android:id="@+id/profile_edit_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:text="@{viewModel.profile.name}"
+            android:textColor="@color/oppiaPrimaryText"
+            android:textSize="20sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+          <TextView
+            android:id="@+id/profile_edit_created"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif"
+            android:textColor="@color/oppiaPrimaryText"
+            android:textSize="16sp"
+            profile:created="@{viewModel.profile.dateCreatedTimestampMs}" />
+        </LinearLayout>
+
+        <de.hdodenhof.circleimageview.CircleImageView
+          android:id="@+id/profile_edit_image"
+          android:layout_width="90dp"
+          android:layout_height="90dp"
+          android:layout_marginStart="28dp"
+          android:layout_marginTop="28dp"
+          android:layout_marginBottom="36dp"
+          android:elevation="2dp"
+          android:translationZ="4dp"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          profile:src="@{viewModel.profile.avatar}" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
+  </ScrollView>
 </layout>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
index afbdcd66ea4..e682ab6c177 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
@@ -3,7 +3,7 @@ package org.oppia.android.app.settings.profile
 import android.app.Application
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
-import androidx.test.core.app.ActivityScenario
+import androidx.test.core.app.ActivityScenario.launch
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
@@ -12,6 +12,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -19,12 +20,10 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.firebase.FirebaseApp
 import dagger.Component
 import org.hamcrest.Matchers.not
 import org.junit.After
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.R
@@ -75,7 +74,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/** Test for [ProfileEditActivity]. */
+/** Tests for [ProfileEditActivity]. */
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(
@@ -87,22 +86,21 @@ class ProfileEditActivityTest {
   @Inject
   lateinit var context: Context
 
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-
   @Inject
   lateinit var profileTestHelper: ProfileTestHelper
 
   @Inject
   lateinit var profileManagementController: ProfileManagementController
 
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+
   @Before
   fun setUp() {
     Intents.init()
     setUpTestApplicationComponent()
     testCoroutineDispatchers.registerIdlingResource()
     profileTestHelper.initializeProfiles()
-    FirebaseApp.initializeApp(context)
   }
 
   @After
@@ -116,15 +114,15 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  fun testProfileEditActivity_updateName_checkNewNameDisplayed() {
+  fun testProfileEdit_updateName_checkNewNameDisplayed() {
     profileManagementController.updateName(
       ProfileId.newBuilder().setInternalId(1).build(),
       newName = "Akshay"
     )
-    ActivityScenario.launch<ProfileEditActivity>(
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -134,15 +132,14 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_startActivityWithAdminProfile_checkAdminInfoIsDisplayed() {
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_startWithAdminProfile_checkAdminInfoIsDisplayed() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        0
+        profileId = 0
       )
     ).use {
+      testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_bar)).check(matches(hasDescendant(withText("Admin"))))
       onView(withId(R.id.profile_edit_name)).check(matches(withText("Admin")))
       onView(withId(R.id.profile_edit_allow_download_container)).check(matches(not(isDisplayed())))
@@ -151,15 +148,14 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_configurationChange_startActivityWithAdminProfile_checkAdminInfoIsDisplayed() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_configChange_startWithAdminProfile_checkAdminInfoIsDisplayed() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        0
+        profileId = 0
       )
     ).use {
+      testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.action_bar)).check(matches(hasDescendant(withText("Admin"))))
       onView(withId(R.id.profile_edit_name)).check(matches(withText("Admin")))
@@ -169,15 +165,14 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_startActivityWithUserProfile_checkUserInfoIsDisplayed() {
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_startWithUserProfile_checkUserInfoIsDisplayed() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
+      testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_bar)).check(matches(hasDescendant(withText("Ben"))))
       onView(withId(R.id.profile_edit_name)).check(matches(withText("Ben")))
       onView(withId(R.id.profile_edit_allow_download_container)).check(matches((isDisplayed())))
@@ -186,15 +181,14 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_configurationChange_startActivityWithUserProfile_checkUserInfoIsDisplayed() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_configChange_startWithUserProfile_checkUserInfoIsDisplayed() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
+      testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.action_bar)).check(matches(hasDescendant(withText("Ben"))))
       onView(withId(R.id.profile_edit_name)).check(matches(withText("Ben")))
@@ -213,11 +207,11 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  fun testProfileEditActivity_startActivityWithUserProfile_clickRenameButton_checkOpensProfileRenameActivity() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_startWithUserProfile_clickRenameButton_checkOpensProfileRename() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(withId(R.id.profile_rename_button)).perform(click())
@@ -226,11 +220,11 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  fun testProfileEditActivity_configurationChange_startActivityWithUserProfile_clickRenameButton_checkOpensProfileRenameActivity() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_configChange_startWithUserProfile_clickRename_checkOpensProfileRename() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(isRoot()).perform(orientationLandscape())
@@ -240,11 +234,11 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  fun testProfileEditActivity_startActivityWithUserProfile_clickResetPin_checkOpensProfileResetPinActivity() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_startWithUserProfile_clickResetPin_checkOpensProfileResetPin() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(withId(R.id.profile_reset_button)).perform(click())
@@ -253,13 +247,11 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_configurationChange_startActivityWithUserProfile_clickResetPin_checkOpensProfileResetPinActivity() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_configChange_startWithUserProfile_clickResetPin_checkOpensProfileResetPin() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(isRoot()).perform(orientationLandscape())
@@ -269,17 +261,16 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_startActivityWithUserProfile_clickProfileDeletionButton_checkOpensDeletionDialog() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_startWithUserProfile_clickProfileDeletionButton_checkOpensDeletionDialog() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(withId(R.id.profile_delete_button)).perform(click())
       onView(withText(R.string.profile_edit_delete_dialog_message))
+        .inRoot(isDialog())
         .check(
           matches(
             isDisplayed()
@@ -289,18 +280,18 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_configurationChange_startActivityWithUserProfile_clickProfileDeletionButton_checkOpensDeletionDialog() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_configChange_startWithUserProfile_clickDelete_checkOpensDeletionDialog() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
+      testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.profile_edit_delete_dialog_message))
+        .inRoot(isDialog())
         .check(
           matches(
             isDisplayed()
@@ -310,42 +301,42 @@ class ProfileEditActivityTest {
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_startActivityWithUserProfile_clickProfileDeletionButton_clickDelete_checkReturnsToProfileListActivity() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_startWithUserProfile_deleteProfile_checkReturnsToProfileList() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(withId(R.id.profile_delete_button)).perform(click())
-      onView(withText(R.string.profile_edit_delete_dialog_positive)).perform(click())
+      onView(withText(R.string.profile_edit_delete_dialog_positive))
+        .inRoot(isDialog())
+        .perform(click())
+      testCoroutineDispatchers.runCurrent()
       intended(hasComponent(ProfileListActivity::class.java.name))
     }
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_configurationChange_startActivityWithUserProfile_clickProfileDeletionButton_clickDelete_checkReturnsToProfileListActivity() { // ktlint-disable max-line-length
-    ActivityScenario.launch<ProfileEditActivity>(
+  fun testProfileEdit_configChange_startWithUserProfile_deleteProfile_checkReturnsToProfileList() {
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        1
+        profileId = 1
       )
     ).use {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
-      onView(withText(R.string.profile_edit_delete_dialog_positive)).perform(click())
+      onView(withText(R.string.profile_edit_delete_dialog_positive))
+        .inRoot(isDialog())
+        .perform(click())
+      testCoroutineDispatchers.runCurrent()
       intended(hasComponent(ProfileListActivity::class.java.name))
     }
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_startActivityWithUserHasDownloadAccess_checkSwitchIsChecked() {
+  fun testProfileEdit_startWithUserHasDownloadAccess_checkSwitchIsChecked() {
     profileManagementController.addProfile(
       name = "James",
       pin = "123",
@@ -354,20 +345,19 @@ class ProfileEditActivityTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    ActivityScenario.launch<ProfileEditActivity>(
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        3
+        profileId = 3
       )
     ).use {
+      testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.profile_edit_allow_download_switch)).check(matches(isChecked()))
     }
   }
 
   @Test
-  // TODO(#973): Fix ProfileEditActivityTest
-  @Ignore
-  fun testProfileEditActivity_configurationChange_startActivityWithUserHasDownloadAccess_checkSwitchIsChecked() { // ktlint-disable max-line-length
+  fun testProfileEdit_configChange_startWithUserHasDownloadAccess_checkSwitchIsChecked() {
     profileManagementController.addProfile(
       name = "James",
       pin = "123",
@@ -376,12 +366,13 @@ class ProfileEditActivityTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    ActivityScenario.launch<ProfileEditActivity>(
+    launch<ProfileEditActivity>(
       ProfileEditActivity.createProfileEditActivity(
         context,
-        3
+        profileId = 3
       )
     ).use {
+      testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_edit_allow_download_switch)).check(matches(isChecked()))
     }