Merge "Update more intuitive string in shortcut warning dialog"