Merge "Solid colour block initialisation for AFBC headers" into main