Merge "Use small weather clock during bypass" into main