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