Fixed bamcontrol
Merge branch 'bam6' of github.com:iGio90/packages_apps_Settings into HEAD