Lockscreen Notifications: some fixes

Conflicts:
	packages/Keyguard/src/com/android/keyguard/NotificationHostView.java