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