Merge "Fixing direct dial shortcut maker"