Merge remote-tracking branch 'xero/dev' into mntm-dev --nobuild

# Conflicts:
#	.gitmodules
#	applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
#	applications/system/application.fam