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