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

Change-Id: Iedb56a2ff7202e448ddca7f48baf0b0c020fe1f8