Merge "Convert Shader to NativeAllocationRegistry" into oc-dev