(cherry picked from commit 935f1fcf3f8e4f9da4774d932b65ae77b44cc773) # Conflicts: # app/build.gradle.kts