(cherry picked from commit 159146e1977fddb8e0e6da90c104cbc3cf81ab5a) # Conflicts: # app/build.gradle # build.gradle.kts