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

* Sigh
* Might be other bugs fixed here as well

Bug: 6249265

Change-Id: I6999113bbed0d853dd428b356ec15a73fe3c9c9c
1 file changed