Merge "Fix dirfd crash issue in property service"