Merge "Add help info at the bottom of the dialog"