Merge "Make solid color cache attempts use alpha" into sc-dev