Rest of Notification Behaviour

Change-Id: I2d4cbf2939e1c3ecf4766fbd8e437c223434ad4a