Merge "Update ImsStateCallbackController"