Fixes clickable notifications

Closes-Bug:#1284628

Change-Id: I7e1b963d594178adc69e8528acae8afde5429c60
Merge "Fixes clickable notifications"