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