Merge "show WSA when ready when using shell transitions" into tm-qpr-dev