Merge "Ensure clock view is added in renderer." into main