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