Merge "sdm: Set surfaceDamage numRects for solid-fill layer"