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