notification style
Merge remote-tracking branch 'upstream/master' into notif-style
Merge pull request #1161 from tarunc/notif-style

notification style
get rid of pause activity
refactoring activity tests
Merge pull request #1173 from tarunc/activity-test-pause

Get rid of pause activity