Merge "Fix cancel crash" into lmp-mr1-dev