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

Change-Id: I469344fe5a8f9a5487177eac7d1225d42c9ba7ed