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