Merge "Enable passing shell transition tests" into tm-dev