Merge "Fixes several Visual issues with the app shortcut popup" into tm-qpr-dev