Merge "Improve app name handling" into tm-qpr-dev