Merge "CachedSet::append: remove mHolePunchLayer" into sc-dev