Merge release/7.85 into main (#3806)

Co-authored-by: Michał Sikora <[email protected]>
Co-authored-by: Eduarda Barbosa <[email protected]>
Co-authored-by: Olivier Halligon <[email protected]>
Co-authored-by: Philip Simpson <[email protected]>
Co-authored-by: Ashita Agrawal <[email protected]>
Co-authored-by: Eduarda Barbosa <[email protected]>

Author: 6 people

version.properties

@@ -1,2 +1,2 @@
-versionName=7.85-rc-2
-versionCode=9324
+versionName=7.85-rc-3
+versionCode=9326