am 5036767d: Merge "Prompt for auto-advance option on first action" into jb-ub-mail

* commit '5036767d2846b285b4bbc1ec16592dccb9fff47a':
  Prompt for auto-advance option on first action