Merge "Fix that CSL cache hits produce bad drawables" into sc-dev