Configurable Notification Behavior [2/2]

Change-Id: Ibb6bd69d4df0bdd664a88213aaab0385ac33a139