Settings: Fix blacklist settings

Change-Id: Ibe5099f132eb7e496469381b4ac3af11d0ecaac6
Seperate double tap gesture option to status bar and lockscreen (2/2)
Merge remote-tracking branch 'settings/remix-staging' into legacy-staging

Conflicts:
	res/xml/blacklist_prefs.xml