Merge "Removing notifications that were kept around longer on click" into pi-dev