Merge "Notification guts redesign" into qt-dev am: 388f6726ea
am: 915d5cbec1

Change-Id: I9afe280b79cc63e6eed9482b0cba6308cdba48bb