Merge "Use correct type for GetValueFromShadowFrame"