Merge "Add xxxhdpi launcher shortcut" into klp-dev