diff --git a/app/build.gradle b/app/build.gradle
index 7a905657c3..092259047e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -334,13 +334,13 @@ dependencies {
     //implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     def startup_version = "1.1.0"
-    def annotation_version_experimental = "1.2.0"
+    def annotation_version_experimental = "1.3.0-alpha01"
     def core_version = "1.8.0" // 1.9.0-alpha05
     def appcompat_version = "1.6.0-alpha05"
-    def emoji_version = "1.2.0-beta01"
-    def activity_version = "1.5.0" // 1.6.0-alpha03
-    def fragment_version = "1.5.0"
-    def windows_version = "1.0.0" // 1.1.0-alpha01
+    def emoji_version = "1.2.0-rc01"
+    def activity_version = "1.5.1" // 1.6.0-alpha03
+    def fragment_version = "1.5.1" // 1.6.0-alpha01
+    def windows_version = "1.0.0" // 1.1.0-alpha03
     def webkit_version = "1.5.0-beta01"
     def recyclerview_version = "1.2.1" // 1.3.0-alpha02
     def coordinatorlayout_version = "1.2.0"
@@ -350,9 +350,9 @@ dependencies {
     def lbm_version = "1.1.0"
     def swiperefresh_version = "1.2.0-alpha01"
     def documentfile_version = "1.1.0-alpha01"
-    def lifecycle_version = "2.5.0" // 2.6.0-alpha01
+    def lifecycle_version = "2.5.1" // 2.6.0-alpha01
     def lifecycle_extensions_version = "2.2.0"
-    def room_version = "2.4.2" // 2.5.0-alpha02
+    def room_version = "2.4.3" // 2.5.0-alpha02
     def sqlite_version = "2.2.0" // 2.3.0-alpha03
     def requery_version = "3.36.0"
     def paging_version = "2.1.2" //  3.2.0-alpha01
diff --git a/app/src/main/java/androidx/room/migration/AutoMigrationSpec.java b/app/src/main/java/androidx/room/AutoMigrationSpec.java
similarity index 100%
rename from app/src/main/java/androidx/room/migration/AutoMigrationSpec.java
rename to app/src/main/java/androidx/room/AutoMigrationSpec.java
diff --git a/app/src/main/java/androidx/room/util/CopyLock.java b/app/src/main/java/androidx/room/CopyLock.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/CopyLock.java
rename to app/src/main/java/androidx/room/CopyLock.java
diff --git a/app/src/main/java/androidx/room/util/CursorUtil.java b/app/src/main/java/androidx/room/CursorUtil.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/CursorUtil.java
rename to app/src/main/java/androidx/room/CursorUtil.java
diff --git a/app/src/main/java/androidx/room/util/DBUtil.java b/app/src/main/java/androidx/room/DBUtil.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/DBUtil.java
rename to app/src/main/java/androidx/room/DBUtil.java
diff --git a/app/src/main/java/androidx/room/DeleteMe.kt b/app/src/main/java/androidx/room/DeleteMe.kt
new file mode 100644
index 0000000000..4474168c82
--- /dev/null
+++ b/app/src/main/java/androidx/room/DeleteMe.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This file exists to trick AGP/lint to work around b/234865137
\ No newline at end of file
diff --git a/app/src/main/java/androidx/room/util/FileUtil.java b/app/src/main/java/androidx/room/FileUtil.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/FileUtil.java
rename to app/src/main/java/androidx/room/FileUtil.java
diff --git a/app/src/main/java/androidx/room/util/FtsTableInfo.java b/app/src/main/java/androidx/room/FtsTableInfo.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/FtsTableInfo.java
rename to app/src/main/java/androidx/room/FtsTableInfo.java
diff --git a/app/src/main/java/androidx/room/paging/LimitOffsetDataSource.java b/app/src/main/java/androidx/room/LimitOffsetDataSource.java
similarity index 98%
rename from app/src/main/java/androidx/room/paging/LimitOffsetDataSource.java
rename to app/src/main/java/androidx/room/LimitOffsetDataSource.java
index d3513473af..81ba417708 100644
--- a/app/src/main/java/androidx/room/paging/LimitOffsetDataSource.java
+++ b/app/src/main/java/androidx/room/LimitOffsetDataSource.java
@@ -154,7 +154,7 @@ public abstract class LimitOffsetDataSource<T> extends androidx.paging.Positiona
             @NonNull LoadInitialCallback<T> callback) {
         registerObserverIfNecessary();
         List<T> list = Collections.emptyList();
-        int totalCount = 0;
+        int totalCount;
         int firstLoadPosition = 0;
         RoomSQLiteQuery sqLiteQuery = null;
         Cursor cursor = null;
@@ -172,8 +172,6 @@ public abstract class LimitOffsetDataSource<T> extends androidx.paging.Positiona
                 mDb.setTransactionSuccessful();
                 list = rows;
             }
-        } catch (Throwable ex) {
-            eu.faircode.email.Log.w(ex);
         } finally {
             if (cursor != null) {
                 cursor.close();
diff --git a/app/src/main/java/androidx/room/migration/Migration.java b/app/src/main/java/androidx/room/Migration.java
similarity index 100%
rename from app/src/main/java/androidx/room/migration/Migration.java
rename to app/src/main/java/androidx/room/Migration.java
diff --git a/app/src/main/java/androidx/room/util/SneakyThrow.java b/app/src/main/java/androidx/room/SneakyThrow.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/SneakyThrow.java
rename to app/src/main/java/androidx/room/SneakyThrow.java
diff --git a/app/src/main/java/androidx/room/util/StringUtil.java b/app/src/main/java/androidx/room/StringUtil.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/StringUtil.java
rename to app/src/main/java/androidx/room/StringUtil.java
diff --git a/app/src/main/java/androidx/room/util/TableInfo.java b/app/src/main/java/androidx/room/TableInfo.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/TableInfo.java
rename to app/src/main/java/androidx/room/TableInfo.java
diff --git a/app/src/main/java/androidx/room/util/UUIDUtil.java b/app/src/main/java/androidx/room/UUIDUtil.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/UUIDUtil.java
rename to app/src/main/java/androidx/room/UUIDUtil.java
diff --git a/app/src/main/java/androidx/room/util/ViewInfo.java b/app/src/main/java/androidx/room/ViewInfo.java
similarity index 100%
rename from app/src/main/java/androidx/room/util/ViewInfo.java
rename to app/src/main/java/androidx/room/ViewInfo.java