Merge "Fix resmgr NE create failed issue"