Merge "Add an API for cancelling current CDM activity"