Merge changes from topic "irvine-ims-service-state-api"

* changes:
  Fix ImsStateCallbackController
  Add ImsStateCallbackController