Attempting to fix settings intent and launcher preferences

Change-Id: I325b11880efdc7ea2881dc3cbdd4ba46c7230d81
Merge branch 'jbam10' of github.com:BAM-Team/android_packages_apps_Trebuchet into jbam10