(cherry picked from commit c31e75f02f3021c52f6c24f655e2bded0c8b2b33) # Conflicts: # .github/workflows/build_pull_request.yml # .github/workflows/build_push.yml # app/build.gradle.kts # build.gradle.kts
(cherry picked from commit 4291cc8eb1f4385528afcc9cab2592c8b3afa44a) # Conflicts: # .gitignore