Updating Notifications to new formatting system (separate flyout messages)

Change-Id: I48962c0443b39de881e588c491e850f9bf3906eb