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