Merge "Fix overriden deep shortcut titles and icons" into tm-dev