Merge "[Notif] Disable long click listener after dismiss" into pi-dev