Merge "Do not call ItemCallback after disconnected" into oc-mr1-dev am: 8724fb9348
am: 57cf99b969

Change-Id: I112b12eac97890092af0362048d6e001cbedb923