Merge "Add a config value for the default of the analog clock flag" into sc-dev