Merge "Don't show single timestamp timeline error message when we have no timestamps at all"