Active notifications:

combine active display and lockscreen notifications. Also improve
and modify/fix up the originals

David96 -> lockscreen notifications
clark scheff -> active display

Change-Id: I7eeb20cdbfd4dc85114b2422ec5e27ac9fa9d452