Merge "Fix chronometer theme" into sc-dev