Lockscreen Notifications: some fixes
Merge "Lockscreen Notifications: some fixes" into android-4.4