Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev