Fix for navbar back/menu firing for longpress actions

Change-Id: I9661b8faa001e69b3a44c91d53f0e858031d08dd
Configurable Notification Behavior [2/2]

PS 2 : Cleanup

Credit: Michele Primavera

Change-Id: I7693b05c6938e979e7d7735c0eff3a5018b81967