Merge "Consolidate logic for 'recent notifications'" into pi-dev