Merge "Only use return transition when requested." into tm-qpr-dev