Merge "Make sure CC knows where it stands after add/remove items locally"