Merge main and re-derive the formatting pass

Conflicting files take main's version and ktlint and the comment
pipeline are re-run on them.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

app/build.gradle.kts

@@ -184,7 +184,7 @@ dependencies {
     // module's classpath would make `:client` unable to change its own
     // dependencies without breaking a screen that never mentioned it.
     implementation(project(":obfs4"))
-    // 🔴 BitmapFactory ignores EXIF orientation, so a photo from a phone
+    // BitmapFactory ignores EXIF orientation, so a photo from a phone
     // camera decodes on its side. This reads the tag so the rotation can be
     // applied before re-encoding drops it. See ImagePrep.orientedFrom.
     implementation("androidx.exifinterface:exifinterface:1.3.7")