Merge "Fixes relative time formatting issue for dates in future"