diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 9e1ddde9e..2a05ee0f8 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -33,7 +33,6 @@
 +|         |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.8.10
 +|         |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*)
 +|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.8.10 (*)
-+|         |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -45,7 +44,8 @@
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|         |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|         +--- androidx.profileinstaller:profileinstaller:1.3.0
 +|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
 +|         |    +--- androidx.concurrent:concurrent-futures:1.1.0
@@ -58,7 +58,6 @@
 +|         |    \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|         +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -69,7 +68,8 @@
 +|         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|         \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 ++--- androidx.databinding:databinding-adapters:7.4.2
 +|    +--- androidx.databinding:databinding-runtime:7.4.2 (*)
 +|    \--- androidx.databinding:databinding-common:7.4.2
@@ -81,9 +81,7 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-process:2.6.1 (c)
@@ -92,7 +90,9 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-livedata:2.4.0 -> 2.6.1
 +|    |    +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*)
 +|    |    +--- androidx.arch.core:core-runtime:2.1.0 -> 2.2.0 (*)
@@ -116,7 +116,6 @@
 +|    |    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
@@ -127,14 +126,14 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-process:2.4.0 -> 2.6.1
 +|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.1.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -145,12 +144,12 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-service:2.4.0 -> 2.6.1
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -161,12 +160,12 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.4.0 -> 2.6.1
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -177,7 +176,8 @@
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.databinding:databinding-runtime:7.4.2 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.8.10 (*)
 ++--- com.github.bitfireAT:dav4jvm:2.2.1
@@ -358,7 +358,6 @@
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (*)
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
@@ -369,11 +368,11 @@
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -384,15 +383,14 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1 -> 2.6.1
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-process:2.6.1 (c)
@@ -401,7 +399,9 @@
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- com.google.android.material:material:1.6.0 -> 1.8.0
 +|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
 +|    |    +--- androidx.appcompat:appcompat:1.5.0 -> 1.6.1 (*)
@@ -524,8 +524,8 @@
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1 -> 2.6.1 (*)
 +|    +--- androidx.savedstate:savedstate-ktx:1.2.0 -> 1.2.1 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.8.10 (*)
-++--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.0 -> 2.6.1 (*)
-++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0 -> 2.6.1 (*)
+++--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 (*)
+++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (*)
 ++--- androidx.room:room-ktx:2.5.1
 +|    +--- androidx.room:room-common:2.5.1 (*)
 +|    +--- androidx.room:room-runtime:2.5.1 (*)
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 10a7812c0..1a476dbac 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -34,7 +34,6 @@
 +|         |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.8.10
 +|         |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*)
 +|         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.8.10 (*)
-+|         |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -46,7 +45,8 @@
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|         |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|         +--- androidx.profileinstaller:profileinstaller:1.3.0
 +|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
 +|         |    +--- androidx.concurrent:concurrent-futures:1.1.0
@@ -59,7 +59,6 @@
 +|         |    \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|         +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -70,7 +69,8 @@
 +|         +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|         +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|         \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|         \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 ++--- androidx.databinding:databinding-adapters:7.4.2
 +|    +--- androidx.databinding:databinding-runtime:7.4.2 (*)
 +|    \--- androidx.databinding:databinding-common:7.4.2
@@ -82,9 +82,7 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-process:2.6.1 (c)
@@ -93,7 +91,9 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-livedata:2.4.0 -> 2.6.1
 +|    |    +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*)
 +|    |    +--- androidx.arch.core:core-runtime:2.1.0 -> 2.2.0 (*)
@@ -117,7 +117,6 @@
 +|    |    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
@@ -128,14 +127,14 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-process:2.4.0 -> 2.6.1
 +|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.1.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -146,12 +145,12 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-service:2.4.0 -> 2.6.1
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -162,12 +161,12 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.4.0 -> 2.6.1
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -178,7 +177,8 @@
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.databinding:databinding-runtime:7.4.2 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.8.10 (*)
 ++--- com.google.firebase:firebase-bom:31.2.3
@@ -524,7 +524,6 @@
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (*)
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
@@ -535,11 +534,11 @@
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
@@ -550,15 +549,14 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1 -> 2.6.1
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-process:2.6.1 (c)
@@ -567,7 +565,9 @@
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c)
-+|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 (c)
++|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.6.1 (c)
 +|    +--- com.google.android.material:material:1.6.0 -> 1.8.0
 +|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
 +|    |    +--- androidx.appcompat:appcompat:1.5.0 -> 1.6.1 (*)
@@ -681,8 +681,8 @@
 +|    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1 -> 2.6.1 (*)
 +|    +--- androidx.savedstate:savedstate-ktx:1.2.0 -> 1.2.1 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.8.10 (*)
-++--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.0 -> 2.6.1 (*)
-++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0 -> 2.6.1 (*)
+++--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 (*)
+++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (*)
 ++--- androidx.room:room-ktx:2.5.1
 +|    +--- androidx.room:room-common:2.5.1 (*)
 +|    +--- androidx.room:room-runtime:2.5.1 (*)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 067128bd4..556dea4ec 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ flipper = "0.187.0"
 hilt = "1.0.0"
 kotlin = "1.8.10"
 leakcanary = "2.10"
-lifecycle = "2.6.0"
+lifecycle = "2.6.1"
 make-it-easy = "4.0.1"
 markwon = "4.6.2"
 mockito = "5.2.0"