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