Merge "Revert "Omit DISPLAY_DECORATION layers from CachedSets"" into tm-dev