Merge "sdm: Clear solid fill stages upon flush"