Merge "Bring timestamps back to notifications." into ics-mr1