Lockscreen Notifications: some fixes

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I9388bcb899080cc023c146a083e554dcf8e57858