Merge "Let launcher clean-up shell transition leashes" into tm-qpr-dev