Merge branch 'dev' into text_formatting

# Conflicts:
#	lib/common/navigation/app_bars/notes_app_bar.dart
#	lib/common/widgets/note_tile.dart
#	lib/l10n/untranslated.txt
#	lib/pages/bin/bin_page.dart
#	lib/pages/notes/notes_page.dart
#	lib/providers/layout/layout_provider.dart
#	lib/utils/preferences/layout.dart
#	lib/utils/preferences/preference_key.dart