Move notification creation to event listener

Change-Id: If5a2987d956e4eed900d8a3d7fcedc83d89fc098