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