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