Merge "Interpolate scrim radius using display shape" into sc-dev