Revert "Blacklist subsettings" and "Fix blacklist FC"
Settings: Fix blacklist settings crash

Change-Id: Idd261aa9f8e2867312aaaece26150671b177994c