Merge "Avoid duplicate rendering of the same cached override buffer" into sc-dev