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