Merge branch 'prefs_interface' into altosdroid