Merge "Switched the notification time to relative time" into nyc-dev