Blacklist: Avoid crash when dialog dismissed via back button.

A user usually presses the back button only
when he/she does not want the changes to be saved.
Hence we need to revert the changes that took place
when the dialog is dismissed with back button.

Change-Id: Ifa3ef41f02f11d1e1627071532d8f915e3b445b6
HOVER: Option to only show up in Fullscreen-Mode [2/2]

Change-Id: I6a9305001884f122441ce47b7128425cd21c6473

Conflicts:
	res/values/kang_strings.xml
	res/xml/hover_settings.xml

Conflicts:
	res/values/liquid_strings.xml
	res/xml/hover_settings.xml