Lockscreen Notifications: some fixes

Change-Id: I634669f05bb94c4cb302c85189c5a4f6d554eb3e