Merge "Add some extra info to the notification list rows." into jb-mr2-dev