Merge branch 'issue-338' into issue-286

Conflicts:
	package/tecla/addon/TeclaSettingsActivity.java
Merged duplicated "full-screen switch mode" preferences.
Merged duplicated "Scanning settings" preferences.
Merge branch 'issue-286' into issue-346

Conflicts:
	package/tecla/addon/TeclaSettingsActivity.java