Merge "Omit DISPLAY_DECORATION layers from CachedSets"