Merge "Update notif onClick logic"