(cherry picked from commit 52911539b842d9cf615cea0e844a51d62cb2fc10)
(cherry picked from commit f312936629657b1160723e044e14d5d0b5d8644f) # Conflicts: # app/build.gradle.kts # build.gradle.kts # settings.gradle.kts