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