A few fixes.

Conflicts:
	res/xml/notification_bg_pref.xml
	src/com/crom/settings/fragments/LockscreenInterface.java
	src/com/crom/settings/fragments/NotificationDrawerStyle.java