Lockscreen Notifications: some fixes

Change-Id: I3ccd2c572dcecc12ea10bde294ad2806be5a2689