Merge "Only show overlay if timeline exists"