Merge "Add display orientation to CachedSet rendering" into sc-dev