fd65aa8fe4
(cherry picked from commit f590378761)
# Conflicts:
# .github/ISSUE_TEMPLATE.md
# .github/ISSUE_TEMPLATE/bug_report.md
# .github/ISSUE_TEMPLATE/feature_request.md
# app/build.gradle.kts