Merge "Remove uses of background color attribute" into sc-v2-dev