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