Merge "Fix 2 bugs that fail to update item listener right." into oc-dev