Merge "Fix clock view out of bound in the carousel" into main