(cherry picked from commit 2dfafa387baa4bee5f0524b1e0c5cf98c21f6b2d) # Conflicts: # app/build.gradle.kts