Merge "Allow a settings override for double-line clock"