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