diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5291124a..54e3e139c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,9 @@ Group changes to describe their impact on the project, as follows:
 ### Fixed
 - Multiple file download attempt from the same chat bubble at the same time needed app restart to properly download each file
 - Generated avatars in dark mode
+- Call state in self-managed TelecomManager service if it takes longer to be created than the call to be answered
+- Show service notification sooner to prevent crash if Core creation takes too long
+- Trying to keep the preferred driver (OpenSLES / AAudio) when switching device
 
 ## [4.6.7] - 2022-05-04
 
diff --git a/app/build.gradle b/app/build.gradle
index 654f61e6c..59c043a9e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -224,14 +224,14 @@ dependencies {
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03"
     implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
 
+    implementation 'androidx.emoji:emoji:1.1.0'
+    implementation 'androidx.emoji:emoji-bundled:1.1.0'
+
     // https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0
     implementation 'com.google.android.material:material:1.6.0'
     // https://github.com/google/flexbox-layout/blob/main/LICENSE Apache v2.0
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
-    implementation 'androidx.emoji:emoji:1.1.0'
-    implementation 'androidx.emoji:emoji-bundled:1.1.0'
-
     // https://github.com/coil-kt/coil/blob/main/LICENSE.txt Apache v2.0
     def coil_version = "2.0.0-rc03"
     implementation("io.coil-kt:coil:$coil_version")