Merge "Fix some shell unit tests with shell transitions" into tm-qpr-dev