Merge "Fix transition being canceled improperly." into lmp-mr1-dev