Merge "Update CmHandleState on deregistration response"