Merge "Reduce lock contention of setting running shell remote transition" into tm-qpr-dev