Merge "Add flag for notif dismissal prototype"