Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev