Settings: Fix blacklist settings

Change-Id: Ibe5099f132eb7e496469381b4ac3af11d0ecaac6
merge changes from Omni 4.4 into local branch