(cherry picked from commit 67128937ca61937f2f778342a0c3c2e34750a255) # Conflicts: # app/build.gradle.kts