diff --git a/OpenEdXMobile/AndroidManifest.xml b/OpenEdXMobile/AndroidManifest.xml
index 18e2e86a80..dca8368a73 100644
--- a/OpenEdXMobile/AndroidManifest.xml
+++ b/OpenEdXMobile/AndroidManifest.xml
@@ -50,13 +50,14 @@
     <application
         android:name=".base.RuntimeApplication"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         tools:replace="android:supportsRtl"
         android:supportsRtl="${supportsRtl}"
         android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme"
-        tools:targetApi="n">
+        tools:targetApi="tiramisu">
 
         <activity
             android:name="org.edx.mobile.view.SplashActivity"
diff --git a/OpenEdXMobile/proguard-rules.pro b/OpenEdXMobile/proguard-rules.pro
index 11cda34db1..8ab06bbc28 100644
--- a/OpenEdXMobile/proguard-rules.pro
+++ b/OpenEdXMobile/proguard-rules.pro
@@ -31,3 +31,9 @@
 
 # Keep Rule to hide the original source file name on stack trace
 -renamesourcefileattribute SourceFile
+
+# Rules enforced by Android Gradle plugin.
+-dontwarn com.google.crypto.**
+-dontwarn com.google.protobuf.**
+-dontwarn com.huawei.hms.ads.**
+-dontwarn edu.umd.cs.findbugs.**
diff --git a/OpenEdXMobile/res/values-es/iap_strings.xml b/OpenEdXMobile/res/values-es/iap_strings.xml
index 7a5474292b..e558dbc700 100644
--- a/OpenEdXMobile/res/values-es/iap_strings.xml
+++ b/OpenEdXMobile/res/values-es/iap_strings.xml
@@ -34,6 +34,9 @@
     <string name="error_course_not_fullfilled">Algo sucedió cuando intentamos actualizar su experiencia en el curso. Si este error continúa, comuníquese con Soporte para obtener ayuda.</string>
     <!--  The price wasn't fetched from the payment sdk  -->
     <string name="error_price_not_fetched">Su solicitud no se pudo completar en este momento. Si este error continúa, comuníquese con Soporte.</string>
+    <!--  The course is upgraded and verified  -->
+    <string name="error_course_paid_and_verified">El curso que desea actualizar ya ha sido pagado. Para obtener ayuda adicional, comuníquese con Soporte.</string>
+
 
     <!-- Full Screen Loader -->
     <string name="fullscreen_loader_unlocking">Desbloqueo</string>
diff --git a/OpenEdXMobile/res/values-fr/iap_strings.xml b/OpenEdXMobile/res/values-fr/iap_strings.xml
index 4d3092429b..07115f10b0 100644
--- a/OpenEdXMobile/res/values-fr/iap_strings.xml
+++ b/OpenEdXMobile/res/values-fr/iap_strings.xml
@@ -34,6 +34,9 @@
     <string name="error_course_not_fullfilled">Quelque chose s’est produit lorsque nous avons essayé de mettre à jour votre expérience de cours. Si cette erreur persiste, contactez le support pour obtenir de l’aide.</string>
     <!--  The price wasn't fetched from the payment sdk  -->
     <string name="error_price_not_fetched">Votre demande n’a pas pu être traitée pour le moment. Si cette erreur persiste, veuillez contacter le support</string>
+    <!--  The course is upgraded and verified  -->
+    <string name="error_course_paid_and_verified">Le cours que vous cherchez à mettre à niveau a déjà été payé. Pour obtenir plus d\'aide, merci de contacter le support.</string>
+
 
     <!-- Full Screen Loader -->
     <string name="fullscreen_loader_unlocking">Déverrouillage</string>
diff --git a/OpenEdXMobile/res/values-iw/iap_strings.xml b/OpenEdXMobile/res/values-iw/iap_strings.xml
index 5437a63014..13621cd1c9 100644
--- a/OpenEdXMobile/res/values-iw/iap_strings.xml
+++ b/OpenEdXMobile/res/values-iw/iap_strings.xml
@@ -34,6 +34,9 @@
     <string name="error_course_not_fullfilled">משהו קרה כשניסינו לעדכן את חוויית הקורס שלך. אם השגיאה הזאת נמשכת, נא לפנות לתמיכה לעזרה.</string>
     <!--  The price wasn't fetched from the payment sdk  -->
     <string name="error_price_not_fetched">לא ניתן להשלים את הבקשה שלך כרגע. אם השגיאה הזאת נמשכת, נא לפנות לתמיכה.</string>
+    <!--  The course is upgraded and verified  -->
+    <string name="error_course_paid_and_verified">הקורס שברצונך לשדרג כבר שולם. לעזרה נוספת, נא לגשת לתמיכה.</string>
+
 
     <!-- Full Screen Loader -->
     <string name="fullscreen_loader_unlocking">הגישה המלאה</string>
diff --git a/OpenEdXMobile/res/values-pt-rBR/iap_strings.xml b/OpenEdXMobile/res/values-pt-rBR/iap_strings.xml
index 4124527eca..b4889179ca 100644
--- a/OpenEdXMobile/res/values-pt-rBR/iap_strings.xml
+++ b/OpenEdXMobile/res/values-pt-rBR/iap_strings.xml
@@ -34,6 +34,9 @@
     <string name="error_course_not_fullfilled">Algo aconteceu quando tentamos atualizar sua experiência no curso. Se o erro persistir, entre em contato com o Suporte para obter ajuda.</string>
     <!--  The price wasn't fetched from the payment sdk  -->
     <string name="error_price_not_fetched">Sua solicitação não pode ser concluída neste momento. Se o erro persistir, entre em contato com o Suporte.</string>
+    <!--  The course is upgraded and verified  -->
+    <string name="error_course_paid_and_verified">O curso que você deseja atualizar já foi pago. Para obter ajuda adicional, entre em contato com o Suporte.</string>
+
 
     <!-- Full Screen Loader -->
     <string name="fullscreen_loader_unlocking">Desbloqueando</string>
diff --git a/OpenEdXMobile/res/values-tr/course_dates_strings.xml b/OpenEdXMobile/res/values-tr/course_dates_strings.xml
index ee8c95eed2..8abbdf7233 100644
--- a/OpenEdXMobile/res/values-tr/course_dates_strings.xml
+++ b/OpenEdXMobile/res/values-tr/course_dates_strings.xml
@@ -43,7 +43,7 @@
     <!-- Title course calendar is out-of-date  -->
     <string name="title_calendar_out_of_date">Ders takviminiz güncel değil</string>
     <!-- Message course calendar is out-of-date  -->
-    <string name="message_calendar_out_of_date">Ders tarihleriniz değiştirildi ve ders takviminiz artık yeni programınızla güncel değil.</string>
+    <string name="message_calendar_out_of_date">Ders tarihleriniz değiştirildi ve ders takviminiz artık yeni programınızla uyumlu değil.</string>
     <!-- Error message while creating calendar for the course events -->
     <string name="adding_calendar_error_message">Takvim Eklenirken Hata, Lütfen daha sonra tekrar deneyin</string>
     <!-- Alert dialog remove course calendar button -->
diff --git a/OpenEdXMobile/res/values-tr/iap_strings.xml b/OpenEdXMobile/res/values-tr/iap_strings.xml
index 72a7e8ec45..271cfad5bd 100644
--- a/OpenEdXMobile/res/values-tr/iap_strings.xml
+++ b/OpenEdXMobile/res/values-tr/iap_strings.xml
@@ -34,9 +34,12 @@
     <string name="error_course_not_fullfilled">Ders deneyiminizi güncellemeye çalıştığımızda bir şey oldu. Bu hata devam ederse, yardım için Destek ile iletişime geçin.</string>
     <!--  The price wasn't fetched from the payment sdk  -->
     <string name="error_price_not_fetched">İsteğiniz şu anda tamamlanamadı. Bu hata devam ederse, lütfen Destek ile iletişime geçin.</string>
+    <!--  The course is upgraded and verified  -->
+    <string name="error_course_paid_and_verified">Yükseltmek istediğiniz dersin ödemesi zaten yapıldı. Ek yardım için Destek ile iletişime geçin.</string>
+
 
     <!-- Full Screen Loader -->
-    <string name="fullscreen_loader_unlocking">Kilidini açma</string>
+    <string name="fullscreen_loader_unlocking">Kilit açılıyor</string>
     <string name="fullscreen_loader_full_access">tam erişim</string>
     <string name="fullscreen_loader_to_your_course">dersinize</string>
 
diff --git a/OpenEdXMobile/res/values-tr/strings.xml b/OpenEdXMobile/res/values-tr/strings.xml
index c00ebd5f50..7c27379855 100644
--- a/OpenEdXMobile/res/values-tr/strings.xml
+++ b/OpenEdXMobile/res/values-tr/strings.xml
@@ -85,7 +85,7 @@
   <!--Button text to show user current downloads screen-->
   <string name="label_current_downloads">Şu anki indirmeleri görüntüle</string>
   <!--Title of user's course list screen-->
-  <string name="label_my_courses">Derslerim</string>
+  <string name="label_my_courses">Dersler</string>
   <!--Title of user's program list screen-->
   <string name="label_my_programs">Programlar</string>
   <!--Title of native Find Courses Screen-->
@@ -93,7 +93,7 @@
   <!--Title of Find Courses tab on Main Dashboard screen-->
   <string name="label_discovery">Keşfet</string>
   <!--Button allowing users to send an email for feedback-->
-  <string name="label_submit_feedback">Geribildirim Gönder</string>
+  <string name="label_submit_feedback">Geribildirim gönder</string>
   <!--Toggle switch on state label-->
   <string name="toggle_turn_on">Açık</string>
   <!--Toggle switch off state label-->
@@ -239,7 +239,7 @@
   <!--Used while constructing the author attribution text for a discussion post e.g. "3 days ago by Brian (Staff)"-->
   <string name="discussion_post_author_attribution">{author} tarafından</string>
   <!--Used while constructing the author attribution text for an answer response e.g. "Marked as answer 2 days ago by Khalid (Community TA)"-->
-  <string name="discussion_post_marked_as_answer">Çözüm olarak işaretlendi.</string>
+  <string name="discussion_post_marked_as_answer">Çözüm olarak işaretlendi</string>
   <!--Used while constructing the author attribution text for an endorsed response e.g. "Endorsed 2 days ago by Khalid"-->
   <string name="discussion_post_endorsed">En İyi Cevap Olarak Seçildi</string>
   <!--Used for putting authorLabel into parenthesis e.g. (Community TA) or (Staff)-->
@@ -310,9 +310,9 @@
   <!--Label for selected topic when creating a post-->
   <string name="discussion_add_post_topic_selection">Konu:  {topic}</string>
   <!--Add post button title in adding a new discussion-->
-  <string name="discussion_add_post_button_label">Tartışma gönder</string>
+  <string name="discussion_add_post_button_label">Tartışmaya ileti gönder</string>
   <!--Add post button description for accessibility in adding a new discussion-->
-  <string name="discussion_add_post_button_description">Tartışma gönder düğmesi</string>
+  <string name="discussion_add_post_button_description">Tartışmaya ileti gönder düğmesi</string>
   <!--Add post button title in adding a new post-->
   <string name="discussion_add_question_button_label">Soru gönder</string>
   <!--Add post button content description for accessibility in adding a new post-->
@@ -391,7 +391,7 @@
     <item quantity="other">{total_videos_count} Video, toplam {total_videos_size}</item>
   </plurals>
   <!--Title for bulk videos download view when download is starting-->
-  <string name="download_starting">İndirilme Başlıyor...</string>
+  <string name="download_starting">İndirme Başlıyor...</string>
   <!--Title for bulk videos download view when in downloading state-->
   <string name="downloading_videos">Videolar İndiriliyor...</string>
   <!--Subtitle for bulk videos download view when in downloading state-->
diff --git a/OpenEdXMobile/res/values-tr/strings_2.xml b/OpenEdXMobile/res/values-tr/strings_2.xml
new file mode 100644
index 0000000000..7dd033389d
--- /dev/null
+++ b/OpenEdXMobile/res/values-tr/strings_2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--  Use this file to add new general strings and stop adding/editing strings in the older file strings.xml
+      Create a new strings file like strings_3.xml file when the strings count reaches 100  -->
+
+<resources>
+    <!-- Dialog Alert title for Open in browser -->
+    <string name="label_leaving_the_app">Uygulamadan çıkılıyor</string>
+    <!-- Dialog Alert Message for Open in browser -->
+    <string name="leaving_the_app_message">{platform_name} uygulamasından çıkıyor ve tarayıcıya geçiyorsunuz.</string>
+</resources>
diff --git a/gradle.properties b/gradle.properties
index d08a16ebab..6ff7a3a766 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,4 @@ android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.nonFinalResIds=false
+android.enableR8.fullMode=false