Merge "Move clocks flags to shared lib" into main