Configurable Notification Behavior [1/2]

PS 2 : Cleanup

Change-Id: I624705944d645eb63b76f2b35a365359a58655ff
Credit: Michele Primavera