diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt
index 28ac258..4b7e9f8 100644
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt
+++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyActivity.kt
@@ -18,15 +18,19 @@ package com.eurekateam.samsungextras.dolby
 
 import android.os.Bundle
 
-import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity
-import com.android.settingslib.collapsingtoolbar.R
+import androidx.fragment.app.FragmentActivity
+import com.android.internal.R.id.content
 
-class DolbyActivity : CollapsingToolbarBaseActivity() {
-    public override fun onCreate(savedInstanceState: Bundle?) {
+class DolbyActivity : FragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        fragmentManager.beginTransaction().replace(
-                R.id.content_frame,
-                DolbyFragment()
-        ).commit()
+        val fragment = this.supportFragmentManager.findFragmentById(content)
+        val dolbyFragment: DolbyFragment
+        if (fragment == null) {
+            dolbyFragment = DolbyFragment()
+            this.supportFragmentManager.beginTransaction()
+                .add(content, dolbyFragment)
+                .commit()
+        }
     }
 }
diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt
index b39fa82..92484f6 100644
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt
+++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/dolby/DolbyFragment.kt
@@ -19,7 +19,7 @@ package com.eurekateam.samsungextras.dolby
 import android.os.Bundle
 import android.widget.Switch
 
-import androidx.preference.PreferenceFragment
+import androidx.preference.PreferenceFragmentCompat
 
 import com.android.settingslib.widget.MainSwitchPreference
 import com.android.settingslib.widget.OnMainSwitchChangeListener
@@ -27,7 +27,7 @@ import com.android.settingslib.widget.RadioButtonPreference
 
 import com.eurekateam.samsungextras.R
 
-class DolbyFragment : PreferenceFragment(), OnMainSwitchChangeListener {
+class DolbyFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
 
     private lateinit var switchBar: MainSwitchPreference