Merge "Update Launcher for removed shared wrappers" into tm-qpr-dev