Merge "Fix tile color issues" into sc-dev