Merge "Replace private color attribute with corresponding color resource" into sc-dev