Merge "Fix missing call to super cancel method" into tm-qpr-dev