Merge "Support SOLID_COLOR composition in GuestFrameComposer"