Merge "Update physicalDisplay when rendering CachedSet to include offset." into sc-dev