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