Notification shortCut (2/2)

Change-Id: Ie059f7fb41fb5147f1035f6983f240070c08bf0c