Merge "Fix new notification showing timestamp "now" after turning off DND" into pi-dev