Configurable Notification Behavior [1/2]

Change-Id: I8b7784ca34b57634384a807aaca99d078af6cffd