Merge "Smartspace - Align large clock" into sc-dev