Merge "Use correct type for GetValueFromShadowFrame" into oc-dev