diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html
index 19daf3359b..529b7da2f1 100755
--- a/vector/src/main/assets/open_source_licenses.html
+++ b/vector/src/main/assets/open_source_licenses.html
@@ -279,25 +279,9 @@ SOFTWARE.
         Copyright 2012 The Dagger Authors
     </li>
     <li>
-        <b>rxkotlin</b>
+        <b>FlowBinding</b>
         <br/>
-        Copyright io.reactivex.
-    </li>
-    <li>
-        <b>rxandroid</b>
-        <br/>
-        Copyright io.reactivex.
-    </li>
-    <li>
-        <b>rxrelay</b>
-        <br/>
-        Copyright 2014 Netflix, Inc.
-        Copyright 2015 Jake Wharton
-    </li>
-    <li>
-        <b>rxbinding</b>
-        <br/>
-        Copyright (C) 2015 Jake Wharton
+        Copyright 2019 Yang Chen
     </li>
     <li>
         <b>Epoxy</b>
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
index 3aeab7c876..d377c74ad7 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
@@ -32,12 +32,12 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.EmojiCompatFontProvider
 import im.vector.app.R
 import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.flow.throttleFirst
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityEmojiReactionPickerBinding
 import im.vector.app.features.reactions.data.EmojiDataSource
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 import reactivecircus.flowbinding.android.widget.queryTextChanges
 import javax.inject.Inject
@@ -167,7 +167,7 @@ class EmojiReactionPickerActivity : VectorBaseActivity<ActivityEmojiReactionPick
             }
 
             searchView.queryTextChanges()
-                    .sample(600)
+                    .throttleFirst(600)
                     .onEach { query ->
                         onQueryText(query.toString())
                     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 362237e60d..67ed2e18f2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -29,6 +29,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.flow.throttleFirst
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.PublishDataSource
@@ -165,7 +166,7 @@ class DevicesViewModel @AssistedInject constructor(
 //                    )
 //                }
 
-        refreshSource.stream().sample(4_000)
+        refreshSource.stream().throttleFirst(4_000)
                 .onEach {
                     session.cryptoService().fetchDevicesList(NoOpMatrixCallback())
                     session.cryptoService().downloadKeys(listOf(session.myUserId), true, NoOpMatrixCallback())