Merge "Check last parent when calculating Shell transition root" into tm-qpr-dev