Merge "Smartspace - Allow primary card colors to be updated" into sc-dev