3a489da679
(cherry picked from commit e1e1c20dbe)
# Conflicts:
# .github/renovate.json
# app/proguard-rules.pro