Merge "Fix shortcut icon in launcher"