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

Change-Id: Ie2347690b84d8bb9caf341ba2e2f8d0055735baf