Clean up Lockscreen notifications
Originally from fusionjack

Change-Id: Ic395a62d07146275dd208540e490bc29cebb2331