am 3d73f98d: (-s ours) Welcome Wizard tweaks. Do not merge.

* commit '3d73f98d6ac275a01b3b88adf83b825cd70c986b':
  Welcome Wizard tweaks. Do not merge.