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