diff --git a/application/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.kt b/application/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.kt
index 08432cac7..e686482c6 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/helpers/FloatingActionButtonBehavior.kt
@@ -45,7 +45,12 @@ class FloatingActionButtonBehavior(context: Context, attrs: AttributeSet?) : Flo
 
     // Listener to workaroud AppCompat 25.x bug
     // FAB doesn't receive any callback when set to GONE.
-    private val onVisibilityChangedListener: FloatingActionButton.OnVisibilityChangedListener
+    private val onVisibilityChangedListener: FloatingActionButton.OnVisibilityChangedListener = object : FloatingActionButton.OnVisibilityChangedListener() {
+        override fun onHidden(fab: FloatingActionButton?) {
+            fab.setInvisible()
+        }
+
+    }
     private var player: FrameLayout? = null
     private val playerBehavior: PlayerBehavior<*>?
         get() {
@@ -53,15 +58,6 @@ class FloatingActionButtonBehavior(context: Context, attrs: AttributeSet?) : Flo
         }
     var shouldNeverShow = false
 
-    init {
-        onVisibilityChangedListener = object : FloatingActionButton.OnVisibilityChangedListener() {
-            override fun onHidden(fab: FloatingActionButton?) {
-                fab.setInvisible()
-            }
-
-        }
-    }
-
     override fun layoutDependsOn(parent: CoordinatorLayout, child: FloatingActionButton, dependency: View): Boolean {
         if (dependency is FrameLayout && dependency.id == R.id.audio_player_container) {
             player = dependency
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/video/benchmark/StartActivityOnCrash.kt b/application/vlc-android/src/org/videolan/vlc/gui/video/benchmark/StartActivityOnCrash.kt
index 7aad046f0..6b5e7ef20 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/video/benchmark/StartActivityOnCrash.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/video/benchmark/StartActivityOnCrash.kt
@@ -27,12 +27,7 @@ import androidx.core.content.edit
 
 class StartActivityOnCrash internal constructor(private val context: Activity) : Thread.UncaughtExceptionHandler {
 
-    private val preferences: SharedPreferences
-
-    init {
-
-        preferences = context.getSharedPreferences(SHARED_PREFERENCE, Context.MODE_WORLD_READABLE)
-    }
+    private val preferences: SharedPreferences = context.getSharedPreferences(SHARED_PREFERENCE, Context.MODE_WORLD_READABLE)
 
     override fun uncaughtException(thread: Thread, throwable: Throwable) {
         var exceptionMessage = throwable.message