Merge "Expand the displayFrame for shadows" into sc-dev