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