Merge "Differentiate between app row and shortcut icons." into tm-qpr-dev