Merge "Move clock flags to shared lib" into main