Merge "Only set valid participant to parent in shell transitions" into tm-dev