Merge "Make CreateSolidColorTexture upload pixel data" into devel/master